| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | pull: make pull.ff=true override merge.ff | Paul Tan | 2015-05-18 | 1 | -0/+8 |
| * | pull: add pull.ff configuration | David Aguilar | 2014-01-15 | 1 | -0/+21 |
| * | many small typofixesob/typofixes | Ondřej Bílka | 2013-07-29 | 1 | -1/+1 |
| * | Correct common spelling mistakes in comments and tests | Stefano Lattarini | 2013-04-12 | 1 | -1/+1 |
| * | t7601 (merge-pull-config): add missing && | Elijah Newren | 2010-10-06 | 1 | -6/+6 |
| * | tests: use "git xyzzy" form (t7200 - t9001) | Nanako Shiraishi | 2008-09-03 | 1 | -1/+1 |
| * | t7601: extend the 'merge picks up the best result' test | Miklos Vajna | 2008-07-23 | 1 | -0/+15 |
| * | builtin-merge: give a proper error message for invalid strategies in config | Miklos Vajna | 2008-07-21 | 1 | -0/+12 |
| * | Fix t7601-merge-pull-config.sh on AIX | Miklos Vajna | 2008-07-06 | 1 | -7/+7 |
| * | Add new test to ensure git-merge handles pull.twohead and pull.octopus | Miklos Vajna | 2008-06-30 | 1 | -0/+129 |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |