diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-01-17 23:04:40 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-17 23:04:40 -0800 |
| commit | 58f37f3c07ef4869f88c79b61f11829bebf7bf40 (patch) | |
| tree | 7cca538f4e2eb9087c764405fb9f93fdd30d5fa9 /Documentation/git-mergetool.txt | |
| parent | contrib: add 'git difftool' for launching common merge tools (diff) | |
| parent | Update draft release notes for 1.6.1.1 (diff) | |
| download | tgif-58f37f3c07ef4869f88c79b61f11829bebf7bf40.tar.xz | |
Merge branch 'maint'
* maint:
Update draft release notes for 1.6.1.1
builtin-fsck: fix off by one head count
t5540: clarify that http-push does not handle packed-refs on the remote
http-push: when making directories, have a trailing slash in the path name
http-push: fix off-by-path_len
Documentation: let asciidoc align related options
githooks.txt: add missing word
builtin-commit.c: do not remove COMMIT_EDITMSG
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions