Commit message (Expand) | Author | Age | |
---|---|---|---|
* | rerere: migrate to parse-options API | Jonathan Nieder | 2010-08-06 |
* | t4200 (rerere): modernize style | Jonathan Nieder | 2010-08-06 |
* | t6038 (merge.renormalize): check that it can be turned off | Jonathan Nieder | 2010-08-06 |
* | t6038 (merge.renormalize): try checkout -m and cherry-pick | Jonathan Nieder | 2010-08-06 |
* | t6038 (merge.renormalize): style nitpicks | Jonathan Nieder | 2010-08-06 |
* | Try normalizing files to avoid delete/modify conflicts when merging | Eyvind Bernhardsen | 2010-07-02 |
* | Avoid conflicts when merging branches with mixed normalization | Eyvind Bernhardsen | 2010-07-02 |
* | Merge branch 'cp/textconv-cat-file' | Junio C Hamano | 2010-06-27 |
|\ | |||
| * | t/t8007: test textconv support for cat-file | Clément Poulain | 2010-06-18 |
* | | Merge branch 'tr/send-email-8bit' | Junio C Hamano | 2010-06-27 |
|\ \ | |||
| * | | send-email: ask about and declare 8bit mails | Thomas Rast | 2010-06-18 |
* | | | Merge branch 'js/maint-am-rebase-invalid-author' | Junio C Hamano | 2010-06-27 |
|\ \ \ | |||
| * | | | am: use get_author_ident_from_commit instead of mailinfo when rebasing | Jay Soffian | 2010-06-16 |
| |/ / | |||
* | | | Merge branch 'ab/blame-textconv' | Junio C Hamano | 2010-06-27 |
|\ \ \ | | |/ | |/| | |||
| * | | t/t8006: test textconv support for blame | Axel Bonnet | 2010-06-18 |
* | | | Merge branch 'sb/format-patch-signature' | Junio C Hamano | 2010-06-22 |
|\ \ \ | |||
| * | | | format-patch: Add a signature option (--signature) | Stephen Boyd | 2010-06-16 |
* | | | | Merge branch 'mg/pretty-magic-space' | Junio C Hamano | 2010-06-22 |
|\ \ \ \ | |||
| * | | | | pretty: Introduce ' ' modifier to add space if non-empty | Michael J Gruber | 2010-06-16 |
| |/ / / | |||
* | | | | Merge branch 'cc/cherry-pick-series' | Junio C Hamano | 2010-06-22 |
|\ \ \ \ | |||
| * | | | | revert: add tests to check cherry-picking many commits | Christian Couder | 2010-06-02 |
| | |/ / | |/| | | |||
* | | | | Merge branch 'jc/rev-list-ancestry-path' | Junio C Hamano | 2010-06-22 |
|\ \ \ \ | |||
| * | | | | revision: Turn off history simplification in --ancestry-path mode | Johan Herland | 2010-06-06 |
| * | | | | revision: --ancestry-path | Junio C Hamano | 2010-04-21 |
* | | | | | Merge branch 'maint' | Junio C Hamano | 2010-06-22 |
|\ \ \ \ \ | |||
| * \ \ \ \ | Merge branch 'ic/maint-rebase-i-abort' into maint | Junio C Hamano | 2010-06-22 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge branch 'cc/maint-commit-reflog-msg' into maint | Junio C Hamano | 2010-06-22 |
| |\ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge branch 'tc/commit-abbrev-fix' into maint | Junio C Hamano | 2010-06-22 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge branch 'jn/document-rebase-i-p-limitation' into maint | Junio C Hamano | 2010-06-22 |
| |\ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ | Merge branch 'cc/maint-diff-CC-binary' into maint | Junio C Hamano | 2010-06-22 |
| |\ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jc/t9129-any-utf8' into maint | Junio C Hamano | 2010-06-22 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'cb/ls-files-cdup' into maint | Junio C Hamano | 2010-06-22 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tc/merge-m-log' into maint | Junio C Hamano | 2010-06-22 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/maint-amend-missing-name' into maint | Junio C Hamano | 2010-06-22 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'pc/remove-warn' into maint | Junio C Hamano | 2010-06-22 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | tests: remove unnecessary '^' from 'expr' regular expression | Junio C Hamano | 2010-06-21 |
| * | | | | | | | | | | | | | | | Merge branch 'cb/assume-unchanged-fix' into maint | Junio C Hamano | 2010-06-21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/notes-doc' into maint | Junio C Hamano | 2010-06-21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ab/test-cleanup' into maint | Junio C Hamano | 2010-06-21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'bg/apply-blank-trailing-context' into maint | Junio C Hamano | 2010-06-21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'cb/maint-stash-orphaned-file' into maint | Junio C Hamano | 2010-06-16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mg/advice-statushints' into maint | Junio C Hamano | 2010-06-16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/maint-bundle' into maint | Junio C Hamano | 2010-06-16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/t7006-fixup' into maint | Junio C Hamano | 2010-06-16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/shortlog' into maint | Junio C Hamano | 2010-06-16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sp/maint-dumb-http-pack-reidx' into maint | Junio C Hamano | 2010-06-16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sp/maint-describe-tiebreak-with-tagger-date' into maint | Junio C Hamano | 2010-06-16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rc/maint-curl-helper' into maint | Junio C Hamano | 2010-06-16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'hg/maint-attr-fix' into maint | Junio C Hamano | 2010-06-16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mh/status-optionally-refresh' into maint | Junio C Hamano | 2010-06-16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |