| 2010-01-21 | Merge branch 'jc/checkout-merge-base' | blob | diff | raw | |
| 2010-01-21 | Merge branch 'ag/patch-header-verify' | blob | diff | raw | |
| 2010-01-21 | Merge branch 'jc/conflict-marker-size' | blob | diff | raw | |
| 2010-01-21 | Merge branch 'ag/maint-apply-too-large-p' | blob | diff | raw | |
| 2010-01-21 | Merge branch 'ap/merge-backend-opts' | blob | diff | raw | |
| 2010-01-18 | Teach git-pull to pass -X<option> to git-merge | blob | diff | raw | |
| 2010-01-18 | git merge -X<option> | blob | diff | raw | diff to current | |