diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2005-08-05 15:34:38 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-08-06 06:06:58 (GMT) |
| commit | eca35ecdcaa1448de8cc9ec64590f47a9012264a (patch) | |
| tree | af11615a155e302b9cf8426b1f146c8a44814045 /Documentation/git-read-tree.txt | |
| parent | 64f8a631e1112efdd4d4236442d59fe871da4bac (diff) | |
| download | git-eca35ecdcaa1448de8cc9ec64590f47a9012264a.zip git-eca35ecdcaa1448de8cc9ec64590f47a9012264a.tar.gz git-eca35ecdcaa1448de8cc9ec64590f47a9012264a.tar.bz2 | |
[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-read-tree.txt')
0 files changed, 0 insertions, 0 deletions