summaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jn/update-contrib-example-merge'Junio C Hamano2010-09-031-25/+90
|\
| * merge script: learn --[no-]rerere-autoupdateJonathan Nieder2010-08-181-2/+5
| * merge script: notice @{-1} shorthandJonathan Nieder2010-08-181-2/+4
| * merge script: handle --no-ff --no-commit correctlyJonathan Nieder2010-08-181-2/+10
| * merge script: --ff-only to disallow true mergeJonathan Nieder2010-08-181-2/+15
| * merge script: handle many-way octopusJonathan Nieder2010-08-181-3/+3
| * merge script: handle -m --log correctlyJonathan Nieder2010-08-181-4/+10
| * merge script: forbid merge -s indexJonathan Nieder2010-08-181-0/+5
| * merge script: allow custom strategiesJonathan Nieder2010-08-181-2/+6
| * merge script: merge -X<option>Jonathan Nieder2010-08-181-1/+7
| * merge script: improve log message subjectJonathan Nieder2010-08-181-8/+19
| * merge script: refuse to merge during mergeJonathan Nieder2010-08-181-0/+3
| * merge script: tweak unmerged files message to match builtinJonathan Nieder2010-08-181-1/+1
| * merge script: --squash, --ff from unborn branch are errorsJonathan Nieder2010-08-181-0/+4
* | Merge branch 'jn/cherry-revert-message-clean-up'Junio C Hamano2010-08-311-1/+0
|\ \
| * | Eliminate “Finished cherry-pick/revert” messageJonathan Nieder2010-08-151-1/+0
* | | Merge branch 'jn/svn-fe'Junio C Hamano2010-08-312-9/+11
|\ \ \
| * | | svn-fe manual: Clarify warning about deltas in dump filesJonathan Nieder2010-08-141-1/+4
| * | | Update svn-fe manualJonathan Nieder2010-08-141-8/+6
| * | | SVN dump parserDavid Barr2010-08-141-0/+1
* | | | Merge branch 'maint'Junio C Hamano2010-08-221-2/+2
|\ \ \ \
| * | | | Typos in code comments, an error message, documentationRalf Wildenhues2010-08-221-2/+2
| * | | | Merge branch 'jn/fix-abbrev' into maintJunio C Hamano2010-08-201-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
* | | | | Merge branch 'jn/fix-abbrev'Junio C Hamano2010-08-181-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | examples/commit: use --abbrev for commit summaryJonathan Nieder2010-07-271-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'kf/post-receive-sample-hook'Junio C Hamano2010-08-181-2/+32
|\ \ \ \ | |_|/ / |/| | |
| * | | post-receive-email: optional message line count limitKevin P. Fleming2010-07-161-2/+32
| | |/ | |/|
* | | post-receive-email: remove spurious commas in email subjectMatthieu Moy2010-08-111-1/+1
* | | contrib/svn-fe: Add the svn-fe target to .gitignoreRamkumar Ramachandra2010-08-031-0/+1
* | | contrib/svn-fe: Fix IncludePathRamkumar Ramachandra2010-08-032-2/+2
| |/ |/|
* | Add a sample user for the svndump libraryJonathan Nieder2010-07-164-0/+147
|/
* Merge branch 'tr/rev-list-count'Junio C Hamano2010-06-301-1/+143
|\
| * bash completion: Support "divergence from upstream" messages in __git_ps1Andrew Sayers2010-06-241-1/+143
* | Merge branch 'as/maint-completion-set-u-fix'Junio C Hamano2010-06-301-7/+7
|\ \
| * | bash-completion: Fix __git_ps1 to work with "set -u"Andrew Sayers2010-06-181-7/+7
* | | Merge branch 'sb/format-patch-signature'Junio C Hamano2010-06-221-1/+2
|\ \ \
| * | | completion: Add --signature and format.signatureStephen Boyd2010-06-161-1/+2
| | |/ | |/|
* | | Merge branch 'em/checkout-orphan'Junio C Hamano2010-06-211-1/+1
|\ \ \ | |/ / |/| |
| * | bash completion: add --orphan to 'git checkout'Erick Mattos2010-06-031-1/+1
* | | Merge branch 'maint'Junio C Hamano2010-05-281-0/+1
|\ \ \ | |/ / |/| / | |/
| * completion: --set-upstream option for git-branchMichael J Gruber2010-05-281-0/+1
* | Merge branch 'st/remote-tags-no-tags'Junio C Hamano2010-05-211-1/+3
|\ \
| * | Honor "tagopt = --tags" configuration optionSamuel Tardieu2010-04-191-1/+3
* | | Merge branch 'jn/request-pull'Junio C Hamano2010-05-211-0/+1
|\ \ \ | |_|/ |/| |
| * | Merge branch 'jn/maint-request-pull' into jn/request-pullJunio C Hamano2010-05-071-0/+1
| |\ \ | | |/ | |/|
| | * request-pull: protect against OPTIONS_KEEPDASHDASH from environmentJonathan Nieder2010-05-011-0/+1
* | | post-receive-email: document command-line modeJonathan Nieder2010-05-191-0/+7
|/ /
* | Merge branch 'sg/bash-completion'Junio C Hamano2010-04-061-60/+34
|\ \
| * | bash: completion for gitk aliasesSZEDER Gábor2010-02-241-0/+9
| * | bash: support user-supplied completion scripts for aliasesSZEDER Gábor2010-02-241-4/+7