summaryrefslogtreecommitdiff
path: root/contrib/examples
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
| |/
* | examples/commit: use --abbrev for commit summaryJonathan Nieder2010-07-271-1/+1
|/
* Honor "tagopt = --tags" configuration optionSamuel Tardieu2010-04-191-1/+3
* Builtin-ify git-notesJohan Herland2010-02-131-0/+121
* git merge -X<option>Avery Pennarun2010-01-171-1/+2
* Merge branch 'jn/help-everywhere'Junio C Hamano2009-11-201-0/+574
|\
| * Retire fetch--tool helper to contrib/examplesJonathan Nieder2009-11-091-0/+574
* | Use 'fast-forward' all over the placeFelipe Contreras2009-10-242-5/+5
|/
* Fix typo in contrib/examples/git-svnimport.txtMichael J Gruber2009-02-251-3/+3
* Convert git-* invocations to "git *" in the svnimport example.Abhijit Menon-Sen2009-02-241-18/+18
* contrib/examples/README: give an explanation of the status of these filesjidanni@jidanni.org2009-01-121-0/+3
* Typo "does not exists" when git remote update remote.Mikael Magnusson2008-10-161-1/+1
* Replace uses of "git-var" with "git var"Todd Zullinger2008-07-302-4/+4
* svnimport: newer libsvn wants us to ask for the root with "", not "/"P. Christeas2008-07-231-1/+1
* Merge branch 'sb/dashless'Junio C Hamano2008-07-161-2/+2
|\
* \ Merge branch 'mv/merge-in-c'Junio C Hamano2008-07-151-0/+554
|\ \ | |/ |/|
| * Build in mergeMiklos Vajna2008-07-071-0/+554
* | Git.pm: Add remote_refs() git-ls-remote frontendPetr Baudis2008-07-081-4/+1
|/
* Merge branch 'db/clone-in-c'Junio C Hamano2008-05-251-0/+525
|\
| * Build in cloneDaniel Barkalow2008-05-041-0/+523
|/
* Resurrect git-rerere to contrib/examplesJunio C Hamano2008-03-161-0/+284
* Merge branch 'js/remote'Junio C Hamano2008-03-111-0/+477
|\
| * Make git-remote a builtinJohannes Schindelin2008-03-011-0/+477
|/
* Merge branch 'db/checkout'Junio C Hamano2008-02-271-0/+302
|\
| * Build in checkoutDaniel Barkalow2008-02-161-0/+298
|/
* Officially deprecate repo-config.Junio C Hamano2008-01-171-1/+1
* contrib: resurrect scripted git-revert.Junio C Hamano2007-12-261-0/+197
* Merge branch 'kh/commit'Junio C Hamano2007-12-041-0/+639
|\
| * Port git commit to C.Kristian Høgsberg2007-11-221-0/+629
* | Merge branch 'maint'Junio C Hamano2007-11-281-1/+1
|\ \
* \ \ Merge branch 'jk/send-pack'Junio C Hamano2007-11-241-0/+142
|\ \ \
| * | | Build in ls-remoteDaniel Barkalow2007-11-051-0/+142
* | | | Merge branch 'sb/clean'Junio C Hamano2007-11-241-0/+118
|\ \ \ \ | |_|_|/ |/| | |
| * | | Make git-clean a builtinShawn Bohrer2007-11-181-0/+118
| |/ /
* | | git-merge-ours: make it a builtin.Thomas Harning2007-11-221-0/+14
|/ /