Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | Merge branch 'nd/clone-depth-zero' | Junio C Hamano | 2010-09-03 | 1 | -2/+5 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | clone: warn users --depth is ignored in local clones | Nguyễn Thái Ngọc Duy | 2010-08-24 | 1 | -2/+5 | |
* | | | | | | | | | | | Merge branch 'jn/apply-filename-with-sp' | Junio C Hamano | 2010-09-03 | 1 | -38/+211 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | apply: handle traditional patches with space in filename | Jonathan Nieder | 2010-08-21 | 1 | -14/+179 | |
| * | | | | | | | | | | | apply: split quoted filename handling into new function | Jonathan Nieder | 2010-08-21 | 1 | -30/+38 | |
* | | | | | | | | | | | | Merge branch 'jn/merge-custom-no-trivial' | Junio C Hamano | 2010-09-03 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | merge: let custom strategies intervene in trivial merges | Jonathan Nieder | 2010-08-15 | 1 | -0/+1 | |
| |/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge branch 'jn/update-contrib-example-merge' | Junio C Hamano | 2010-09-03 | 3 | -6/+58 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | fmt-merge-msg -m to override merge title | Jonathan Nieder | 2010-08-18 | 1 | -2/+16 | |
| * | | | | | | | | | | | merge-base --independent to print reduced parent list in a merge | Jonathan Nieder | 2010-08-18 | 1 | -6/+15 | |
| * | | | | | | | | | | | merge-base --octopus to mimic show-branch --merge-base | Jonathan Nieder | 2010-08-18 | 1 | -3/+32 | |
| * | | | | | | | | | | | merge: do not mistake (ancestor of) tag for branch | Jonathan Nieder | 2010-08-18 | 1 | -1/+1 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'jn/merge-renormalize' | Junio C Hamano | 2010-09-03 | 5 | -26/+64 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | merge-recursive --renormalize | Jonathan Nieder | 2010-08-06 | 4 | -5/+32 | |
| * | | | | | | | | | | rerere: migrate to parse-options API | Jonathan Nieder | 2010-08-06 | 1 | -24/+28 | |
| * | | | | | | | | | | ll-merge: let caller decide whether to renormalize | Jonathan Nieder | 2010-08-06 | 1 | -0/+4 | |
| * | | | | | | | | | | Avoid conflicts when merging branches with mixed normalization | Eyvind Bernhardsen | 2010-07-02 | 1 | -0/+3 | |
* | | | | | | | | | | | Sync with 1.7.2.3 | Junio C Hamano | 2010-09-03 | 1 | -1/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | builtin/merge_recursive.c: Add an usage string and make use of it. | Thiago Farina | 2010-09-03 | 1 | -1/+4 | |
| * | | | | | | | | | | Merge branch 'sg/rerere-gc-old-still-used' into maint | Junio C Hamano | 2010-09-01 | 1 | -5/+16 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'dj/fetch-tagopt' into maint | Junio C Hamano | 2010-09-01 | 1 | -4/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/cherry-revert-message-clean-up' | Junio C Hamano | 2010-08-31 | 1 | -69/+70 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | cherry-pick/revert: Use advise() for hints | Jonathan Nieder | 2010-08-15 | 1 | -23/+11 | |
| * | | | | | | | | | | | | | cherry-pick/revert: Use error() for failure message | Jonathan Nieder | 2010-08-15 | 1 | -2/+5 | |
| * | | | | | | | | | | | | | Introduce advise() to print hints | Jonathan Nieder | 2010-08-15 | 1 | -0/+9 | |
| * | | | | | | | | | | | | | Eliminate “Finished cherry-pick/revert” message | Jonathan Nieder | 2010-08-15 | 1 | -2/+0 | |
| * | | | | | | | | | | | | | revert: improve success message by adding abbreviated commit sha1 | Christian Couder | 2010-07-16 | 1 | -2/+3 | |
| * | | | | | | | | | | | | | revert: don't print "Finished one cherry-pick." if commit failed | Christian Couder | 2010-07-16 | 1 | -12/+5 | |
| * | | | | | | | | | | | | | revert: refactor commit code into a new run_git_commit() function | Christian Couder | 2010-07-16 | 1 | -25/+27 | |
| * | | | | | | | | | | | | | revert: report success when using option --strategy | Christian Couder | 2010-07-16 | 1 | -22/+29 | |
* | | | | | | | | | | | | | | Merge branch 'ab/maint-reset-mixed-w-pathspec-advice' | Junio C Hamano | 2010-08-31 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | reset: suggest what to do upon "git reset --mixed <paths>" | Ævar Arnfjörð Bjarmason | 2010-08-21 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | Merge branch 'dj/fetch-tagopt' | Junio C Hamano | 2010-08-31 | 1 | -4/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | fetch: allow command line --tags to override config | Daniel Johnson | 2010-08-14 | 1 | -4/+6 | |
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'en/d-f-conflict-fix' | Junio C Hamano | 2010-08-31 | 1 | -0/+29 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | fast-export: Fix output order of D/F changes | Elijah Newren | 2010-07-09 | 1 | -0/+29 | |
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'jn/paginate-fix' | Junio C Hamano | 2010-08-31 | 9 | -31/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | merge-file: run setup_git_directory_gently() sooner | Nguyễn Thái Ngọc Duy | 2010-08-15 | 1 | -3/+1 | |
| * | | | | | | | | | | | | | var: run setup_git_directory_gently() sooner | Nguyễn Thái Ngọc Duy | 2010-08-15 | 1 | -7/+2 | |
| * | | | | | | | | | | | | | ls-remote: run setup_git_directory_gently() sooner | Nguyễn Thái Ngọc Duy | 2010-08-15 | 1 | -3/+0 | |
| * | | | | | | | | | | | | | index-pack: run setup_git_directory_gently() sooner | Nguyễn Thái Ngọc Duy | 2010-08-15 | 1 | -2/+0 | |
| * | | | | | | | | | | | | | Merge branch 'jn/maint-setup-fix' (early part) into jn/paginate-fix | Junio C Hamano | 2010-08-15 | 1 | -19/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | config: run setup_git_directory_gently() sooner | Nguyễn Thái Ngọc Duy | 2010-08-15 | 1 | -3/+2 | |
| * | | | | | | | | | | | | | | bundle: run setup_git_directory_gently() sooner | Nguyễn Thái Ngọc Duy | 2010-08-15 | 1 | -4/+2 | |
| * | | | | | | | | | | | | | | apply: run setup_git_directory_gently() sooner | Nguyễn Thái Ngọc Duy | 2010-08-15 | 1 | -3/+3 | |
| * | | | | | | | | | | | | | | grep: run setup_git_directory_gently() sooner | Nguyễn Thái Ngọc Duy | 2010-08-11 | 1 | -4/+2 | |
| * | | | | | | | | | | | | | | shortlog: run setup_git_directory_gently() sooner | Nguyễn Thái Ngọc Duy | 2010-08-11 | 1 | -2/+1 | |
* | | | | | | | | | | | | | | | Merge branch 'jn/maint-setup-fix' | Junio C Hamano | 2010-08-31 | 1 | -19/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Revert "rehabilitate 'git index-pack' inside the object store" | Nguyễn Thái Ngọc Duy | 2010-08-04 | 1 | -19/+5 | |
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'en/fast-export-fix' | Junio C Hamano | 2010-08-31 | 1 | -1/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ |