summaryrefslogtreecommitdiffstats
path: root/git-merge-resolve.sh (unfollow)
Commit message (Expand)AuthorFilesLines
2016-10-07pull: make code more similar to the shell script againJohannes Schindelin1-10/+20
2016-10-07pull: drop confusing prefix parameter of die_on_unclean_work_tree()Johannes Schindelin1-8/+8
2016-09-09Start the 2.11 cycleJunio C Hamano3-2/+58
2016-09-09Prepare for 2.9.4Junio C Hamano2-1/+84
2016-09-02Git 2.10v2.10.0Junio C Hamano2-1/+6
2016-08-31A few more fixes before the final 2.10Junio C Hamano1-3/+8
2016-08-31diff-highlight: avoid highlighting combined diffsJeff King2-1/+38
2016-08-31diff-highlight: add multi-byte testsJeff King1-1/+35