Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'jn/merge-renormalize' | Junio C Hamano | 2010-09-03 |
|\ | |||
| * | merge-recursive --renormalize | Jonathan Nieder | 2010-08-06 |
| * | rerere: migrate to parse-options API | Jonathan Nieder | 2010-08-06 |
| * | ll-merge: let caller decide whether to renormalize | Jonathan Nieder | 2010-08-06 |
| * | Avoid conflicts when merging branches with mixed normalization | Eyvind Bernhardsen | 2010-07-02 |
* | | Sync with 1.7.2.3 | Junio C Hamano | 2010-09-03 |
|\ \ | |||
| * | | builtin/merge_recursive.c: Add an usage string and make use of it. | Thiago Farina | 2010-09-03 |
| * | | Merge branch 'sg/rerere-gc-old-still-used' into maint | Junio C Hamano | 2010-09-01 |
| |\ \ | |||
| * \ \ | Merge branch 'dj/fetch-tagopt' into maint | Junio C Hamano | 2010-09-01 |
| |\ \ \ | |||
* | \ \ \ | Merge branch 'jn/cherry-revert-message-clean-up' | Junio C Hamano | 2010-08-31 |
|\ \ \ \ \ | |||
| * | | | | | cherry-pick/revert: Use advise() for hints | Jonathan Nieder | 2010-08-15 |
| * | | | | | cherry-pick/revert: Use error() for failure message | Jonathan Nieder | 2010-08-15 |
| * | | | | | Introduce advise() to print hints | Jonathan Nieder | 2010-08-15 |
| * | | | | | Eliminate “Finished cherry-pick/revert” message | Jonathan Nieder | 2010-08-15 |
| * | | | | | revert: improve success message by adding abbreviated commit sha1 | Christian Couder | 2010-07-16 |
| * | | | | | revert: don't print "Finished one cherry-pick." if commit failed | Christian Couder | 2010-07-16 |
| * | | | | | revert: refactor commit code into a new run_git_commit() function | Christian Couder | 2010-07-16 |
| * | | | | | revert: report success when using option --strategy | Christian Couder | 2010-07-16 |
* | | | | | | Merge branch 'ab/maint-reset-mixed-w-pathspec-advice' | Junio C Hamano | 2010-08-31 |
|\ \ \ \ \ \ | |||
| * | | | | | | reset: suggest what to do upon "git reset --mixed <paths>" | Ævar Arnfjörð Bjarmason | 2010-08-21 |
* | | | | | | | Merge branch 'dj/fetch-tagopt' | Junio C Hamano | 2010-08-31 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||
| * | | | | | | fetch: allow command line --tags to override config | Daniel Johnson | 2010-08-14 |
* | | | | | | | Merge branch 'en/d-f-conflict-fix' | Junio C Hamano | 2010-08-31 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | fast-export: Fix output order of D/F changes | Elijah Newren | 2010-07-09 |
* | | | | | | | | Merge branch 'jn/paginate-fix' | Junio C Hamano | 2010-08-31 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | merge-file: run setup_git_directory_gently() sooner | Nguyễn Thái Ngọc Duy | 2010-08-15 |
| * | | | | | | | | var: run setup_git_directory_gently() sooner | Nguyễn Thái Ngọc Duy | 2010-08-15 |
| * | | | | | | | | ls-remote: run setup_git_directory_gently() sooner | Nguyễn Thái Ngọc Duy | 2010-08-15 |
| * | | | | | | | | index-pack: run setup_git_directory_gently() sooner | Nguyễn Thái Ngọc Duy | 2010-08-15 |
| * | | | | | | | | Merge branch 'jn/maint-setup-fix' (early part) into jn/paginate-fix | Junio C Hamano | 2010-08-15 |
| |\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | config: run setup_git_directory_gently() sooner | Nguyễn Thái Ngọc Duy | 2010-08-15 |
| * | | | | | | | | | bundle: run setup_git_directory_gently() sooner | Nguyễn Thái Ngọc Duy | 2010-08-15 |
| * | | | | | | | | | apply: run setup_git_directory_gently() sooner | Nguyễn Thái Ngọc Duy | 2010-08-15 |
| * | | | | | | | | | grep: run setup_git_directory_gently() sooner | Nguyễn Thái Ngọc Duy | 2010-08-11 |
| * | | | | | | | | | shortlog: run setup_git_directory_gently() sooner | Nguyễn Thái Ngọc Duy | 2010-08-11 |
* | | | | | | | | | | Merge branch 'jn/maint-setup-fix' | Junio C Hamano | 2010-08-31 |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||
| * | | | | | | | | | Revert "rehabilitate 'git index-pack' inside the object store" | Nguyễn Thái Ngọc Duy | 2010-08-04 |
| | |_|/ / / / / / | |/| | | | | | | | |||
* | | | | | | | | | Merge branch 'en/fast-export-fix' | Junio C Hamano | 2010-08-31 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | fast-export: Add a --full-tree option | Elijah Newren | 2010-07-19 |
| * | | | | | | | | | fast-export: Fix dropping of files with --import-marks and path limiting | Elijah Newren | 2010-07-19 |
* | | | | | | | | | | Merge branch 'sg/rerere-gc-old-still-used' | Junio C Hamano | 2010-08-31 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||
| * | | | | | | | | | rerere: fix overeager gc | SZEDER Gábor | 2010-07-14 |
* | | | | | | | | | | object.h: Add OBJECT_ARRAY_INIT macro and make use of it. | Thiago Farina | 2010-08-29 |
* | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-08-26 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||
| * | | | | | | | | | for-each-ref: fix objectname:short bug | Jay Soffian | 2010-08-26 |
| * | | | | | | | | | Fix 'git log' early pager startup error case | Linus Torvalds | 2010-08-25 |
* | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-08-22 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||
| * | | | | | | | | | Typos in code comments, an error message, documentation | Ralf Wildenhues | 2010-08-22 |
| * | | | | | | | | | Merge branch 'jn/fix-abbrev' into maint | Junio C Hamano | 2010-08-20 |
| |\ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jn/rebase-rename-am' into maint | Junio C Hamano | 2010-08-20 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | |