diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-12-05 17:49:13 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-05 17:49:13 -0800 |
| commit | 27ee189163070f53a87e033171a45520f70b242e (patch) | |
| tree | b1c6bba0f03a0ab8cef38f991f2af14a408599b3 /git-mergetool.sh | |
| parent | 3b78959ece0212225ae71efbdf2c1a2183e532f5 (diff) | |
| parent | f23272f3fd84fd37d97917f37233fbf01deb32b4 (diff) | |
| download | git-27ee189163070f53a87e033171a45520f70b242e.tar.gz git-27ee189163070f53a87e033171a45520f70b242e.tar.xz | |
Merge branch 'maint'
* maint:
git-am -i: report rewritten title
git grep shows the same hit repeatedly for unmerged paths
Do check_repository_format() early (re-fix)
Do check_repository_format() early
Add missing inside_work_tree setting in setup_git_directory_gently
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions