Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | Merge branch 'mg/pretty-magic-space' | Junio C Hamano | 2010-06-22 | 3 | -4/+25 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | pretty: Introduce ' ' modifier to add space if non-empty | Michael J Gruber | 2010-06-16 | 3 | -3/+24 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'jn/gitweb-return-or-exit-cleanup' | Junio C Hamano | 2010-06-22 | 1 | -0/+9 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | gitweb: Return or exit after done serving request | Jakub Narebski | 2010-06-14 | 1 | -1/+9 | |
* | | | | | | | | | | Merge branch 'bd/maint-unpack-trees-parawalk-fix' | Junio C Hamano | 2010-06-22 | 1 | -2/+10 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | unpack-trees: Make index lookahead less pessimal | Brian Downing | 2010-06-18 | 1 | -2/+10 | |
* | | | | | | | | | | | Merge branch 'cc/cherry-pick-series' | Junio C Hamano | 2010-06-22 | 4 | -66/+264 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Documentation/revert: describe passing more than one commit | Christian Couder | 2010-06-02 | 1 | -14/+37 | |
| * | | | | | | | | | | | Documentation/cherry-pick: describe passing more than one commit | Christian Couder | 2010-06-02 | 1 | -11/+53 | |
| * | | | | | | | | | | | revert: add tests to check cherry-picking many commits | Christian Couder | 2010-06-02 | 1 | -0/+95 | |
| * | | | | | | | | | | | revert: allow cherry-picking more than one commit | Christian Couder | 2010-06-02 | 1 | -10/+41 | |
| * | | | | | | | | | | | revert: change help_msg() to take no argument | Christian Couder | 2010-06-02 | 1 | -4/+4 | |
| * | | | | | | | | | | | revert: refactor code into a do_pick_commit() function | Christian Couder | 2010-06-02 | 1 | -19/+25 | |
| * | | | | | | | | | | | revert: use run_command_v_opt() instead of execv_git_cmd() | Christian Couder | 2010-06-02 | 1 | -2/+9 | |
| * | | | | | | | | | | | revert: cleanup code for -x option | Christian Couder | 2010-06-02 | 1 | -7/+1 | |
* | | | | | | | | | | | | Merge branch 'jc/rev-list-ancestry-path' | Junio C Hamano | 2010-06-22 | 4 | -3/+226 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | revision: Turn off history simplification in --ancestry-path mode | Johan Herland | 2010-06-06 | 2 | -0/+18 | |
| * | | | | | | | | | | | | revision: Fix typo in --ancestry-path error message | Johan Herland | 2010-06-06 | 1 | -1/+1 | |
| * | | | | | | | | | | | | Documentation/rev-list-options.txt: Explain --ancestry-path | Johan Herland | 2010-06-06 | 1 | -2/+48 | |
| * | | | | | | | | | | | | Documentation/rev-list-options.txt: Fix missing line in example history graph | Johan Herland | 2010-06-06 | 1 | -1/+1 | |
| * | | | | | | | | | | | | revision: --ancestry-path | Junio C Hamano | 2010-04-21 | 3 | -0/+159 | |
* | | | | | | | | | | | | | Merge branch 'lt/extended-sha1-match-commit-with-regexp' | Junio C Hamano | 2010-06-22 | 1 | -3/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Make :/ accept a regex rather than a fixed pattern | Linus Torvalds | 2010-06-14 | 1 | -3/+9 | |
* | | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-06-22 | 4 | -4/+24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Update draft release notes to 1.7.1.1 | Junio C Hamano | 2010-06-22 | 1 | -0/+21 | |
| * | | | | | | | | | | | | | Merge branch 'ic/maint-rebase-i-abort' into maint | Junio C Hamano | 2010-06-22 | 2 | -1/+12 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'cc/maint-commit-reflog-msg' into maint | Junio C Hamano | 2010-06-22 | 2 | -6/+13 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/maint-advice-empty-amend' into maint | Junio C Hamano | 2010-06-22 | 1 | -0/+7 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tc/commit-abbrev-fix' into maint | Junio C Hamano | 2010-06-22 | 2 | -6/+72 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/document-rebase-i-p-limitation' into maint | Junio C Hamano | 2010-06-22 | 2 | -0/+33 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/checkout-doc' into maint | Junio C Hamano | 2010-06-22 | 1 | -23/+31 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'cc/maint-diff-CC-binary' into maint | Junio C Hamano | 2010-06-22 | 3 | -5/+98 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/t9129-any-utf8' into maint | Junio C Hamano | 2010-06-22 | 1 | -7/+13 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'cb/ls-files-cdup' into maint | Junio C Hamano | 2010-06-22 | 4 | -71/+110 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tc/merge-m-log' into maint | Junio C Hamano | 2010-06-22 | 5 | -41/+87 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ph/clone-message-reword' into maint | Junio C Hamano | 2010-06-22 | 1 | -1/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/maint-amend-missing-name' into maint | Junio C Hamano | 2010-06-22 | 2 | -7/+59 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'pc/remove-warn' into maint | Junio C Hamano | 2010-06-22 | 6 | -21/+68 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | tests: remove unnecessary '^' from 'expr' regular expression | Junio C Hamano | 2010-06-21 | 2 | -3/+3 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/maint-receive-pack-symref-alias' | Junio C Hamano | 2010-06-21 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tr/receive-pack-aliased-update-fix' into js/maint-receive-pack-... | Junio C Hamano | 2010-06-17 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'cc/maint-commit-reflog-msg' | Junio C Hamano | 2010-06-21 | 2 | -6/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit: use value of GIT_REFLOG_ACTION env variable as reflog message | Christian Couder | 2010-06-13 | 2 | -6/+13 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ic/maint-rebase-i-abort' | Junio C Hamano | 2010-06-21 | 2 | -1/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | rebase -i: Abort cleanly if new base cannot be checked out | Ian Ward Comfort | 2010-06-11 | 2 | -1/+12 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/maint-advice-empty-amend' | Junio C Hamano | 2010-06-21 | 1 | -0/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | commit: give advice on empty amend | Jeff King | 2010-06-11 | 1 | -0/+7 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'eb/core-eol' | Junio C Hamano | 2010-06-21 | 12 | -110/+570 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Add "core.eol" config variable | Eyvind Bernhardsen | 2010-06-07 | 8 | -51/+188 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Rename the "crlf" attribute "text" | Eyvind Bernhardsen | 2010-05-20 | 7 | -56/+91 |