aboutsummaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAge
* Merge branch 'jn/update-contrib-example-merge'Junio C Hamano2010-09-03
|\
| * merge script: learn --[no-]rerere-autoupdateJonathan Nieder2010-08-18
| * merge script: notice @{-1} shorthandJonathan Nieder2010-08-18
| * merge script: handle --no-ff --no-commit correctlyJonathan Nieder2010-08-18
| * merge script: --ff-only to disallow true mergeJonathan Nieder2010-08-18
| * merge script: handle many-way octopusJonathan Nieder2010-08-18
| * merge script: handle -m --log correctlyJonathan Nieder2010-08-18
| * merge script: forbid merge -s indexJonathan Nieder2010-08-18
| * merge script: allow custom strategiesJonathan Nieder2010-08-18
| * merge script: merge -X<option>Jonathan Nieder2010-08-18
| * merge script: improve log message subjectJonathan Nieder2010-08-18
| * merge script: refuse to merge during mergeJonathan Nieder2010-08-18
| * merge script: tweak unmerged files message to match builtinJonathan Nieder2010-08-18
| * merge script: --squash, --ff from unborn branch are errorsJonathan Nieder2010-08-18
* | Merge branch 'jn/cherry-revert-message-clean-up'Junio C Hamano2010-08-31
|\ \
| * | Eliminate “Finished cherry-pick/revert” messageJonathan Nieder2010-08-15
* | | Merge branch 'jn/svn-fe'Junio C Hamano2010-08-31
|\ \ \
| * | | svn-fe manual: Clarify warning about deltas in dump filesJonathan Nieder2010-08-14
| * | | Update svn-fe manualJonathan Nieder2010-08-14
| * | | SVN dump parserDavid Barr2010-08-14
* | | | Merge branch 'maint'Junio C Hamano2010-08-22
|\ \ \ \
| * | | | Typos in code comments, an error message, documentationRalf Wildenhues2010-08-22
| * | | | Merge branch 'jn/fix-abbrev' into maintJunio C Hamano2010-08-20
| |\ \ \ \ | | |/ / / | |/| | |
* | | | | Merge branch 'jn/fix-abbrev'Junio C Hamano2010-08-18
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | examples/commit: use --abbrev for commit summaryJonathan Nieder2010-07-27
| | |_|/ | |/| |
* | | | Merge branch 'kf/post-receive-sample-hook'Junio C Hamano2010-08-18
|\ \ \ \ | |_|/ / |/| | |
| * | | post-receive-email: optional message line count limitKevin P. Fleming2010-07-16
| | |/ | |/|
* | | post-receive-email: remove spurious commas in email subjectMatthieu Moy2010-08-11
* | | contrib/svn-fe: Add the svn-fe target to .gitignoreRamkumar Ramachandra2010-08-03
* | | contrib/svn-fe: Fix IncludePathRamkumar Ramachandra2010-08-03
| |/ |/|
* | Add a sample user for the svndump libraryJonathan Nieder2010-07-16
|/
* Merge branch 'tr/rev-list-count'Junio C Hamano2010-06-30
|\
| * bash completion: Support "divergence from upstream" messages in __git_ps1Andrew Sayers2010-06-24
* | Merge branch 'as/maint-completion-set-u-fix'Junio C Hamano2010-06-30
|\ \
| * | bash-completion: Fix __git_ps1 to work with "set -u"Andrew Sayers2010-06-18
* | | Merge branch 'sb/format-patch-signature'Junio C Hamano2010-06-22
|\ \ \
| * | | completion: Add --signature and format.signatureStephen Boyd2010-06-16
| | |/ | |/|
* | | Merge branch 'em/checkout-orphan'Junio C Hamano2010-06-21
|\ \ \ | |/ / |/| |
| * | bash completion: add --orphan to 'git checkout'Erick Mattos2010-06-03
* | | Merge branch 'maint'Junio C Hamano2010-05-28
|\ \ \ | |/ / |/| / | |/
| * completion: --set-upstream option for git-branchMichael J Gruber2010-05-28
* | Merge branch 'st/remote-tags-no-tags'Junio C Hamano2010-05-21
|\ \
| * | Honor "tagopt = --tags" configuration optionSamuel Tardieu2010-04-19
* | | Merge branch 'jn/request-pull'Junio C Hamano2010-05-21
|\ \ \ | |_|/ |/| |
| * | Merge branch 'jn/maint-request-pull' into jn/request-pullJunio C Hamano2010-05-07
| |\ \ | | |/ | |/|
| | * request-pull: protect against OPTIONS_KEEPDASHDASH from environmentJonathan Nieder2010-05-01
* | | post-receive-email: document command-line modeJonathan Nieder2010-05-19
|/ /
* | Merge branch 'sg/bash-completion'Junio C Hamano2010-04-06
|\ \
| * | bash: completion for gitk aliasesSZEDER Gábor2010-02-24
| * | bash: support user-supplied completion scripts for aliasesSZEDER Gábor2010-02-24