diff options
| author |  Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2005-08-05 17:34:38 +0200 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2005-08-05 23:06:58 -0700 |
| commit | eca35ecdcaa1448de8cc9ec64590f47a9012264a (patch) | |
| tree | af11615a155e302b9cf8426b1f146c8a44814045 /Documentation/git-update-server-info.txt | |
| parent | [PATCH] git: use git_mkstemp() instead of mkstemp() for diff generation. (diff) | |
| download | tgif-eca35ecdcaa1448de8cc9ec64590f47a9012264a.tar.xz | |
[PATCH] git-commit-script fix for degenerated merge
If merging results in an unchanged tree, git-commit-script should not
complain that there's nothing to commit.
Also, add "[--all]" to usage().
[jc: usually there is no reason to record an unchanging merge,
but this code path is triggered only when there is a nontrivial
merge that needed to be resolved by hand, and we should be able
to record the fact that these two tree heads are dealt with as a
regular two-parent commit in order to help later merges.]
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-update-server-info.txt')
0 files changed, 0 insertions, 0 deletions