Skip to content

G
git

李少辉-开发者 / git
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 1
Fork 0
G
git

体验新版 GitCode，发现更多精彩内容 >>

切换分支/标签
  1. 13 3月, 2008 1 次提交
  3. 12 3月, 2008 1 次提交
  5. 11 3月, 2008 1 次提交
  7. 10 3月, 2008 1 次提交
  9. 09 3月, 2008 3 次提交
  11. 08 3月, 2008 1 次提交
  13. 06 3月, 2008 7 次提交
    • M
      git-submodule - Allow adding a submodule in-place · d4264ca3
      由 Mark Levedahl 提交于 
      When working in the top-level project, it is useful to create a new
submodule as a git repo in a subdirectory, then add that submodule to
the top-level in place.

This patch allows "git submodule add <intended url> subdir" to add the
existing subdir to the current project.  The presumption is the user will
later push / clone the subdir to the <intended url> so that future
submodule init / updates will work.

Absent this patch, "git submodule add" insists upon cloning the subdir
from a repository at the given url, which is fine for adding an existing
project in, but less useful when adding a new submodule from scratch to an
existing project.  The former functionality remains, and the clone is
attempted if the subdir does not already exist as a valid git repo.
Signed-off-by: NMark Levedahl <mlevedahl@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      d4264ca3
    • C
      run-command: Redirect stderr to a pipe before redirecting stdout to stderr · ce2cf27a
      由 Christian Couder 提交于 
      With this patch, in the 'start_command' function after forking
we now take care of stderr in the child process before stdout.

This way if 'start_command' is called with a 'child_process'
argument like this:

	.err = -1;
	.stdout_to_stderr = 1;

then stderr will be redirected to a pipe before stdout is
redirected to stderr. So we can now get the process' stdout
from the pipe (as well as its stderr).

Earlier such a call would have redirected stdout to stderr
before stderr was itself redirected, and therefore stdout
would not have followed stderr, which would not have been
very useful anyway.

Update documentation in 'api-run-command.txt' accordingly.
Signed-off-by: NChristian Couder <chriscool@tuxfamily.org>
Acked-by: NJohannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      ce2cf27a
    • C
      Teach git mergetool to use custom commands defined at config time · 964473a0
      由 Charles Bailey 提交于 
      Currently git mergetool is restricted to a set of commands defined
in the script. You can subvert the mergetool.<tool>.path to force
git mergetool to use a different command, but if you have a command
whose invocation syntax does not match one of the current tools then
you would have to write a wrapper script for it.

This patch adds two git config variable patterns which allow a more
flexible choice of merge tool.

If you run git mergetool with -t/--tool or the merge.tool config
variable set to an unrecognized tool then git mergetool will query the
mergetool.<tool>.cmd config variable. If this variable exists, then git
mergetool will treat the specified tool as a custom command and will use
a shell eval to run the command with the documented shell variables set.

mergetool.<tool>.trustExitCode can be used to indicate that the exit
code of the custom command can be used to determine the success of the
merge.
Signed-off-by: NCharles Bailey <charles@hashpling.org>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      964473a0
    • C
      Tidy up git mergetool's backup file behaviour · 44c36d1c
      由 Charles Bailey 提交于 
      Currently a backup pre-merge file with conflict markers is sometimes
kept with a .orig extenstion and sometimes removed depending on the
particular merge tool used.

This patch makes the handling consistent across all merge tools and
configurable via a new mergetool.keepBackup config variable
Signed-off-by: NCharles Bailey <charles@hashpling.org>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      44c36d1c
    • D
      log/show/whatchanged: introduce format.pretty configuration · 94c22a5e
      由 Denis Cheng 提交于 
      When running log/show/whatchanged from the command line, the user may
want to use a preferred format without having to pass --pretty=<fmt>
option every time from the command line.  This teaches these three
commands to honor a new configuration variable, format.pretty.

The --pretty option given from the command line will override the
configured format.

The earlier patch fixed the in-tree callers that run these commands
for purposes other than showing the output directly to the end user
(the only other in-tree caller is "git bisect visualize", whose output
directly goes to the end user and should be affected by this patch).

Similar fixes will be needed for end-user scripts that parse the
output from these commands and expect them to be in the default pretty
format.
Signed-off-by: NDenis Cheng <crquan@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      94c22a5e
    • D
      whatchanged documentation: share description of --pretty with others · 5348337a
      由 Denis Cheng 提交于 
      The documentation had its own description for --pretty and did not
include pretty-options/formats as documentation for other commands in
the "log" family did.
Signed-off-by: NDenis Cheng <crquan@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      5348337a
    • J
      am: remove support for -d .dotest · e72c7406
      由 Junio C Hamano 提交于 
      It has been supported for a long time, but I do not think this feature has
been in use in the real world at all.  We would eventually move this out
of the toplevel of the work tree and to somewhere under $GIT_DIR, so let's
remove the command line option to specify the location now.
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      e72c7406
  15. 05 3月, 2008 2 次提交
    • S
      Teach fetch-pack/upload-pack about --include-tag · 348e390b
      由 Shawn O. Pearce 提交于 
      The new protocol extension "include-tag" allows the client side
of the connection (fetch-pack) to request that the server side of the
native git protocol (upload-pack / pack-objects) use --include-tag
as it prepares the packfile, thus ensuring that an annotated tag object
will be included in the resulting packfile if the object it refers to
was also included into the packfile.
Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      348e390b
    • S
      git-pack-objects: Automatically pack annotated tags if object was packed · f0a24aa5
      由 Shawn O. Pearce 提交于 
      The new option "--include-tag" allows the caller to request that
any annotated tag be included into the packfile if the object the tag
references was also included as part of the packfile.

This option can be useful on the server side of a native git transport,
where the server knows what commits it is including into a packfile to
update the client.  If new annotated tags have been introduced then we
can also include them in the packfile, saving the client from needing
to request them through a second connection.

This change only introduces the backend option and provides a test.
Protocol extensions to make this useful in fetch-pack/upload-pack
are still necessary to activate the logic during transport.
Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      f0a24aa5
  17. 04 3月, 2008 3 次提交
  19. 03 3月, 2008 6 次提交
  21. 02 3月, 2008 2 次提交
  23. 01 3月, 2008 4 次提交
  25. 29 2月, 2008 6 次提交
  27. 28 2月, 2008 2 次提交