| commit | 4f9f1f5d56e4b41cadeaaa8c89eb567ed9eb7279 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 22 Jul 2013 05:51:32 +0000 (21 22:51 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 22 Jul 2013 05:51:32 +0000 (21 22:51 -0700) | ||
| tree | 39b53f3b447c22a63640ac01281937cba5f14f5a | treesnapshot (tar.gz zip) |
| parent | 80f074396d2a5601cdbf643f9b0db09329070a3f | commitdiff |
| parent | 76b80cdf17807ba4a773562df2218980ffa27e4f | commitdiff |
Merge branch 'mm/merge-in-dirty-worktree-doc' into maint
* mm/merge-in-dirty-worktree-doc:
Documentation/git-merge.txt: weaken warning about uncommited changes
* mm/merge-in-dirty-worktree-doc:
Documentation/git-merge.txt: weaken warning about uncommited changes
| Documentation/git-merge.txt | diff1 | diff2 | blobhistory |