Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'maint' | Junio C Hamano | 2008-09-03 | 78 | -517/+595 |
|\ | |||||
| * | Merge branch 'nd/worktree' into maint | Junio C Hamano | 2008-09-03 | 1 | -2/+62 |
| |\ | |||||
| | * | grep: fix worktree setup | Nguyễn Thái Ngọc Duy | 2008-08-28 | 1 | -0/+5 |
| | * | diff*: fix worktree setup | Nguyễn Thái Ngọc Duy | 2008-08-28 | 1 | -2/+57 |
| * | | Merge branch 'ho/dashless' into maint | Junio C Hamano | 2008-09-03 | 76 | -515/+515 |
| |\ \ | |||||
| | * | | tests: use "git xyzzy" form (t7200 - t9001) | Nanako Shiraishi | 2008-09-03 | 18 | -99/+99 |
| | * | | tests: use "git xyzzy" form (t7000 - t7199) | Nanako Shiraishi | 2008-09-03 | 6 | -183/+183 |
| | * | | tests: use "git xyzzy" form (t3600 - t6999) | Nanako Shiraishi | 2008-09-03 | 26 | -130/+130 |
| | * | | tests: use "git xyzzy" form (t0000 - t3599) | Nanako Shiraishi | 2008-09-03 | 26 | -103/+103 |
| * | | | clone: fix creation of explicitly named target directory | Clemens Buchacher | 2008-09-03 | 1 | -0/+18 |
* | | | | Merge branch 'tr/filter-branch' | Junio C Hamano | 2008-09-02 | 2 | -2/+99 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'jc/post-simplify' into tr/filter-branch | Junio C Hamano | 2008-08-12 | 1 | -0/+93 |
| |\ \ \ \ | |||||
| | * | | | | Topo-sort before --simplify-merges | Junio C Hamano | 2008-08-03 | 1 | -0/+93 |
| * | | | | | filter-branch: fix ref rewriting with --subdirectory-filter | Thomas Rast | 2008-08-12 | 1 | -1/+1 |
| * | | | | | filter-branch: Extend test to show rewriting bug | Thomas Rast | 2008-08-12 | 1 | -3/+7 |
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-09-02 | 1 | -3/+3 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Bring local clone's origin URL in line with that of a remote clone | Johan Herland | 2008-09-01 | 1 | -3/+3 |
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-08-30 | 2 | -3/+92 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | git-apply: Loosen "match_beginning" logic | Junio C Hamano | 2008-08-30 | 1 | -3/+12 |
| * | | | | | Merge branch 'sp/missing-thin-base' into maint | Junio C Hamano | 2008-08-30 | 1 | -0/+80 |
| |\ \ \ \ \ | |||||
| | * | | | | | pack-objects: Allow missing base objects when creating thin packs | Shawn O. Pearce | 2008-08-12 | 1 | -0/+80 |
| | |/ / / / | |||||
| * | | | | | Merge branch 'np/verify-pack' into maint | Junio C Hamano | 2008-08-29 | 1 | -0/+6 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
* | | | | | | 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 |