summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Merge branch 'mg/pretty-magic-space'Junio C Hamano2010-06-223-4/+25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | pretty: Introduce ' ' modifier to add space if non-emptyMichael J Gruber2010-06-163-3/+24
| |/ / / / / / / /
* | | | | | | | | Merge branch 'jn/gitweb-return-or-exit-cleanup'Junio C Hamano2010-06-221-0/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | gitweb: Return or exit after done serving requestJakub Narebski2010-06-141-1/+9
* | | | | | | | | | Merge branch 'bd/maint-unpack-trees-parawalk-fix'Junio C Hamano2010-06-221-2/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | unpack-trees: Make index lookahead less pessimalBrian Downing2010-06-181-2/+10
* | | | | | | | | | | Merge branch 'cc/cherry-pick-series'Junio C Hamano2010-06-224-66/+264
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Documentation/revert: describe passing more than one commitChristian Couder2010-06-021-14/+37
| * | | | | | | | | | | Documentation/cherry-pick: describe passing more than one commitChristian Couder2010-06-021-11/+53
| * | | | | | | | | | | revert: add tests to check cherry-picking many commitsChristian Couder2010-06-021-0/+95
| * | | | | | | | | | | revert: allow cherry-picking more than one commitChristian Couder2010-06-021-10/+41
| * | | | | | | | | | | revert: change help_msg() to take no argumentChristian Couder2010-06-021-4/+4
| * | | | | | | | | | | revert: refactor code into a do_pick_commit() functionChristian Couder2010-06-021-19/+25
| * | | | | | | | | | | revert: use run_command_v_opt() instead of execv_git_cmd()Christian Couder2010-06-021-2/+9
| * | | | | | | | | | | revert: cleanup code for -x optionChristian Couder2010-06-021-7/+1
* | | | | | | | | | | | Merge branch 'jc/rev-list-ancestry-path'Junio C Hamano2010-06-224-3/+226
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | revision: Turn off history simplification in --ancestry-path modeJohan Herland2010-06-062-0/+18
| * | | | | | | | | | | | revision: Fix typo in --ancestry-path error messageJohan Herland2010-06-061-1/+1
| * | | | | | | | | | | | Documentation/rev-list-options.txt: Explain --ancestry-pathJohan Herland2010-06-061-2/+48
| * | | | | | | | | | | | Documentation/rev-list-options.txt: Fix missing line in example history graphJohan Herland2010-06-061-1/+1
| * | | | | | | | | | | | revision: --ancestry-pathJunio C Hamano2010-04-213-0/+159
* | | | | | | | | | | | | Merge branch 'lt/extended-sha1-match-commit-with-regexp'Junio C Hamano2010-06-221-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Make :/ accept a regex rather than a fixed patternLinus Torvalds2010-06-141-3/+9
* | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-06-224-4/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Update draft release notes to 1.7.1.1Junio C Hamano2010-06-221-0/+21
| * | | | | | | | | | | | | Merge branch 'ic/maint-rebase-i-abort' into maintJunio C Hamano2010-06-222-1/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cc/maint-commit-reflog-msg' into maintJunio C Hamano2010-06-222-6/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-advice-empty-amend' into maintJunio C Hamano2010-06-221-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tc/commit-abbrev-fix' into maintJunio C Hamano2010-06-222-6/+72
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/document-rebase-i-p-limitation' into maintJunio C Hamano2010-06-222-0/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/checkout-doc' into maintJunio C Hamano2010-06-221-23/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cc/maint-diff-CC-binary' into maintJunio C Hamano2010-06-223-5/+98
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/t9129-any-utf8' into maintJunio C Hamano2010-06-221-7/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cb/ls-files-cdup' into maintJunio C Hamano2010-06-224-71/+110
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tc/merge-m-log' into maintJunio C Hamano2010-06-225-41/+87
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ph/clone-message-reword' into maintJunio C Hamano2010-06-221-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/maint-amend-missing-name' into maintJunio C Hamano2010-06-222-7/+59
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pc/remove-warn' into maintJunio C Hamano2010-06-226-21/+68
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | tests: remove unnecessary '^' from 'expr' regular expressionJunio C Hamano2010-06-212-3/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/maint-receive-pack-symref-alias'Junio C Hamano2010-06-210-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tr/receive-pack-aliased-update-fix' into js/maint-receive-pack-...Junio C Hamano2010-06-171-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cc/maint-commit-reflog-msg'Junio C Hamano2010-06-212-6/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | commit: use value of GIT_REFLOG_ACTION env variable as reflog messageChristian Couder2010-06-132-6/+13
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ic/maint-rebase-i-abort'Junio C Hamano2010-06-212-1/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | rebase -i: Abort cleanly if new base cannot be checked outIan Ward Comfort2010-06-112-1/+12
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/maint-advice-empty-amend'Junio C Hamano2010-06-211-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | commit: give advice on empty amendJeff King2010-06-111-0/+7
| |/ / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'eb/core-eol'Junio C Hamano2010-06-2112-110/+570
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | Add "core.eol" config variableEyvind Bernhardsen2010-06-078-51/+188
| * | | | | | | | | | | | | | | | | | | | | | | | | | Rename the "crlf" attribute "text"Eyvind Bernhardsen2010-05-207-56/+91