| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'sb/dashless' | Junio C Hamano | 2008-07-16 | 59 | -234/+248 |
| |\ | |||||
| | * | t/: Use "test_must_fail git" instead of "! git" | Stephan Beyer | 2008-07-13 | 58 | -233/+247 |
| | * | t/test-lib.sh: exit with small negagive int is ok with test_must_fail | Stephan Beyer | 2008-07-13 | 1 | -1/+1 |
| * | | Merge branch 'maint' | Junio C Hamano | 2008-07-16 | 1 | -31/+7 |
| |\ \ | |||||
| | * \ | Merge branch 'ls/maint-mailinfo-patch-label' into maint | Junio C Hamano | 2008-07-16 | 6 | -1/+101 |
| | |\ \ | |||||
| | * | | | t7600-merge: Use test_expect_failure to test option parsing | Johannes Sixt | 2008-07-16 | 1 | -30/+6 |
| * | | | | t/Makefile: use specified shell when running aggregation script | SungHyun Nam | 2008-07-16 | 1 | -1/+1 |
| * | | | | t/aggregate-results: whitespace fix | Junio C Hamano | 2008-07-16 | 1 | -5/+5 |
| * | | | | t/lib-git-svn: fix SVN_HTTPD tests to work with "trash directory" | Eric Wong | 2008-07-16 | 1 | -1/+1 |
| * | | | | Merge branch 'mv/merge-in-c' | Junio C Hamano | 2008-07-15 | 7 | -0/+371 |
| |\ \ \ \ | |||||
| | * | | | | reduce_heads(): protect from duplicate input | Junio C Hamano | 2008-07-14 | 1 | -0/+22 |
| | * | | | | reduce_heads(): thinkofix | Sverre Hvammen Johansen | 2008-07-13 | 1 | -0/+11 |
| | * | | | | Add a new test for git-merge-resolve | Miklos Vajna | 2008-07-13 | 1 | -0/+46 |
| | * | | | | t6021: add a new test for git-merge-resolve | Miklos Vajna | 2008-07-13 | 1 | -0/+4 |
| | * | | | | Teach merge.log to "git-merge" again | Junio C Hamano | 2008-07-10 | 1 | -0/+7 |
| | * | | | | Build in merge | Miklos Vajna | 2008-07-07 | 1 | -1/+1 |
| | * | | | | Fix t7601-merge-pull-config.sh on AIX | Miklos Vajna | 2008-07-06 | 1 | -7/+7 |
| | * | | | | Add new test case to ensure git-merge prepends the custom merge message | Miklos Vajna | 2008-07-06 | 1 | -0/+37 |
| | * | | | | Add new test case to ensure git-merge reduces octopus parents when possible | Miklos Vajna | 2008-06-30 | 1 | -0/+63 |
| | * | | | | Add new test to ensure git-merge handles more than 25 refs. | Miklos Vajna | 2008-06-30 | 1 | -0/+52 |
| | * | | | | Add new test to ensure git-merge handles pull.twohead and pull.octopus | Miklos Vajna | 2008-06-30 | 1 | -0/+129 |
| * | | | | | Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge" | Johannes Schindelin | 2008-07-15 | 5 | -20/+20 |
| * | | | | | t9600: allow testing with cvsps 2.2, including beta versions | Pavel Roskin | 2008-07-15 | 1 | -2/+2 |
| * | | | | | Merge branch 'js/merge-rr' | Junio C Hamano | 2008-07-14 | 1 | -3/+3 |
| |\ \ \ \ \ | |||||
| | * | | | | | Move MERGE_RR from .git/rr-cache/ into .git/ | Johannes Schindelin | 2008-07-13 | 1 | -3/+3 |
| * | | | | | | Merge branch 'ls/maint-mailinfo-patch-label' | Junio C Hamano | 2008-07-14 | 6 | -1/+101 |
| |\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| | * | | | | | git-mailinfo: Fix getting the subject from the in-body [PATCH] line | Lukas Sandström | 2008-07-13 | 6 | -1/+101 |
| * | | | | | | Merge branch 'om/rerere-careful' | Junio C Hamano | 2008-07-14 | 1 | -6/+20 |
| |\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | | builtin-rerere: more carefully find conflict markers | Olivier Marin | 2008-07-10 | 1 | -6/+20 |
| | | |_|_|/ | |/| | | | |||||
| * | | | | | restore legacy behavior for read_sha1_file() | Nicolas Pitre | 2008-07-14 | 1 | -0/+60 |
| * | | | | | git-submodule - make "submodule add" more strict, and document it | Mark Levedahl | 2008-07-14 | 1 | -1/+1 |
| * | | | | | git-svn: find-rev and rebase for SVN::Mirror repositories | João Abecasis | 2008-07-14 | 1 | -0/+9 |
| * | | | | | t3404: test two "preserve merges with -p" cases | Stephan Beyer | 2008-07-13 | 1 | -5/+21 |
| * | | | | | Merge branch 'maint' to sync with 1.5.6.3 | Junio C Hamano | 2008-07-13 | 2 | -9/+33 |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | | t0004: fix timing bug | Junio C Hamano | 2008-07-12 | 1 | -9/+10 |
| | | |/ / | |/| | | |||||
| | * | | | Fix backwards-incompatible handling of core.sharedRepository | Petr Baudis | 2008-07-11 | 1 | -0/+23 |
| * | | | | Merge branch 'am/stash-branch' | Junio C Hamano | 2008-07-13 | 1 | -0/+60 |
| |\ \ \ \ | |||||
| | * | | | | Add a test for "git stash branch" | Abhijit Menon-Sen | 2008-07-06 | 1 | -0/+60 |
| * | | | | | Merge branch 'jc/report-tracking' | Junio C Hamano | 2008-07-13 | 1 | -0/+70 |
| |\ \ \ \ \ | |||||
| | * | | | | | stat_tracking_info(): clear object flags used during counting | Junio C Hamano | 2008-07-03 | 1 | -0/+70 |
| | |/ / / / | |||||
| * | | | | | Merge branch 'js/pick-root' | Junio C Hamano | 2008-07-13 | 1 | -0/+30 |
| |\ \ \ \ \ | |||||
| | * | | | | | Allow cherry-picking root commits | Johannes Schindelin | 2008-07-07 | 1 | -0/+30 |
| * | | | | | | Merge branch 'tr/add-i-e' | Junio C Hamano | 2008-07-13 | 1 | -0/+67 |
| |\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| | * | | | | | git-add--interactive: manual hunk editing mode | Thomas Rast | 2008-07-02 | 1 | -0/+67 |
| * | | | | | | apply: fix copy/rename breakage | Junio C Hamano | 2008-07-09 | 1 | -0/+20 |
| * | | | | | | Merge branch 'js/apply-root' | Junio C Hamano | 2008-07-09 | 1 | -0/+43 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | git-apply --directory: make --root more similar to GNU diff | Junio C Hamano | 2008-07-06 | 1 | -4/+4 |
| | * | | | | | | apply --root: thinkofix. | Junio C Hamano | 2008-07-02 | 1 | -2/+13 |
| | * | | | | | | Teach "git apply" to prepend a prefix with "--root=<root>" | Johannes Schindelin | 2008-07-01 | 1 | -0/+32 |
| | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | | t9100-git-svn-basic.sh: Fix determination of utf-8 locale | Ramsay Jones | 2008-07-09 | 1 | -4/+4 |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |