| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'maint' | Junio C Hamano | 2008-08-29 | 1 | -0/+6 |
| |\ | |||||
| | * | pretty=format: respect date format options | Jeff King | 2008-08-29 | 1 | -0/+6 |
| * | | Merge branch 'mv/merge-custom' | Junio C Hamano | 2008-08-27 | 2 | -0/+53 |
| |\ \ | |||||
| | * | | t7606: fix custom merge test | Junio C Hamano | 2008-08-23 | 1 | -2/+5 |
| | * | | Add a second testcase for handling invalid strategies in git-merge | Miklos Vajna | 2008-07-29 | 1 | -0/+4 |
| | * | | Add a new test for using a custom merge strategy | Miklos Vajna | 2008-07-29 | 1 | -0/+46 |
| * | | | Merge branch 'am/cherry-pick-rerere' | Junio C Hamano | 2008-08-27 | 1 | -0/+45 |
| |\ \ \ | |||||
| | * | | | Make cherry-pick use rerere for conflict resolution. | Abhijit Menon-Sen | 2008-08-11 | 1 | -0/+45 |
| * | | | | Merge branch 'np/verify-pack' | Junio C Hamano | 2008-08-27 | 1 | -0/+6 |
| |\ \ \ \ | |||||
| | * | | | | discard revindex data when pack list changes | Nicolas Pitre | 2008-08-22 | 1 | -0/+6 |
| * | | | | | Merge branch 'maint' | Junio C Hamano | 2008-08-26 | 4 | -10/+26 |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | | Suppress some bash redirection error messages | Ramsay Jones | 2008-08-26 | 3 | -10/+4 |
| | * | | | | Fix "git log -i --grep" | Jeff King | 2008-08-24 | 1 | -0/+22 |
| * | | | | | format-patch: use default diff format even with patch options | Jeff King | 2008-08-26 | 1 | -0/+25 |
| * | | | | | Merge branch 'maint' to sync with 1.6.0.1 | Junio C Hamano | 2008-08-24 | 4 | -1/+39 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Merge branch 'ag/maint-combine-diff-fix' into maint | Junio C Hamano | 2008-08-24 | 1 | -0/+16 |
| | |\ \ \ \ | |||||
| | | * | | | | Respect core.autocrlf in combined diff | Alexander Gavrilov | 2008-08-23 | 1 | -0/+16 |
| | | |/ / / | |||||
| | * | | | | merge: fix numerus bugs around "trivial merge" area | Junio C Hamano | 2008-08-23 | 3 | -1/+23 |
| | |/ / / | |||||
| * | | | | Extend "checkout --track" DWIM to support more cases | Alex Riesen | 2008-08-22 | 1 | -1/+22 |
| * | | | | filter-branch: Grok special characters in tag names | Johannes Sixt | 2008-08-21 | 1 | -0/+8 |
| * | | | | test-lib: do not remove trash_directory if called with --debug | Johannes Schindelin | 2008-08-21 | 1 | -1/+1 |
| * | | | | Merge branch 'jc/add-stop-at-symlink' | Junio C Hamano | 2008-08-20 | 1 | -0/+25 |
| |\ \ \ \ | |||||
| | * | | | | add: refuse to add working tree items beyond symlinks | Junio C Hamano | 2008-08-04 | 1 | -1/+6 |
| | * | | | | update-index: refuse to add working tree items beyond symlinks | Junio C Hamano | 2008-08-04 | 1 | -0/+20 |
| * | | | | | Merge branch 'kh/diff-tree' | Junio C Hamano | 2008-08-20 | 1 | -0/+14 |
| |\ \ \ \ \ | |||||
| | * | | | | | Add test for diff-tree --stdin with two trees | Karl Hasselström | 2008-08-11 | 1 | -0/+14 |
| * | | | | | | Merge branch 'mg/count-objects' | Junio C Hamano | 2008-08-20 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | count-objects: Add total pack size to verbose output | Marcus Griep | 2008-08-17 | 1 | -1/+1 |
| * | | | | | | | Merge branch 'cc/merge-base-many' | Junio C Hamano | 2008-08-20 | 1 | -0/+48 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | merge-base-many: add trivial tests based on the documentation | Junio C Hamano | 2008-07-29 | 1 | -0/+48 |
| | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | | Merge branch 'jc/test-deeper' | Junio C Hamano | 2008-08-20 | 50 | -131/+152 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | tests: use $TEST_DIRECTORY to refer to the t/ directory | Junio C Hamano | 2008-08-17 | 51 | -134/+152 |
| | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | | Merge branch 'js/parallel-test' | Junio C Hamano | 2008-08-20 | 4 | -7/+14 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Update t/.gitignore to ignore all trash directories | Marcus Griep | 2008-08-18 | 1 | -1/+1 |
| | * | | | | | | | Enable parallel tests | Johannes Schindelin | 2008-08-08 | 2 | -2/+7 |
| | * | | | | | | | tests: Clarify dependencies between tests, 'aggregate-results' and 'clean' | Johannes Schindelin | 2008-08-08 | 1 | -1/+6 |
| | * | | | | | | | t9700: remove useless check | Johannes Schindelin | 2008-08-08 | 1 | -3/+0 |
| * | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-08-20 | 6 | -0/+55 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| | * | | | | | | | "git-merge": allow fast-forwarding in a stat-dirty tree | Junio C Hamano | 2008-08-20 | 1 | -0/+10 |
| | * | | | | | | | for-each-ref: cope with tags with incomplete lines | Junio C Hamano | 2008-08-20 | 1 | -0/+10 |
| | * | | | | | | | diff --check: do not get confused by new blank lines in the middle | Junio C Hamano | 2008-08-20 | 1 | -0/+11 |
| | * | | | | | | | mailinfo: avoid violating strbuf assertion | Jeff King | 2008-08-19 | 3 | -0/+24 |
| * | | | | | | | | Merge branch 'dp/hash-literally' | Junio C Hamano | 2008-08-19 | 1 | -4/+52 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | add --no-filters option to git hash-object | Dmitry Potapov | 2008-08-03 | 1 | -0/+24 |
| | * | | | | | | | | add --path option to git hash-object | Dmitry Potapov | 2008-08-03 | 1 | -0/+24 |
| | * | | | | | | | | correct argument checking test for git hash-object | Dmitry Potapov | 2008-08-03 | 1 | -4/+4 |
| * | | | | | | | | | Merge branch 'js/checkout-dwim-local' | Junio C Hamano | 2008-08-19 | 1 | -0/+11 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | checkout --track: make up a sensible branch name if '-b' was omitted | Johannes Schindelin | 2008-08-11 | 1 | -0/+11 |
| | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | | add boolean diff.suppress-blank-empty config option | Jim Meyering | 2008-08-19 | 1 | -0/+39 |
| | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | | t1002-read-tree-m-u-2way.sh: use 'git diff -U0' rather than 'diff -U0' | Brandon Casey | 2008-08-18 | 1 | -4/+6 |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |