summaryrefslogtreecommitdiff
path: root/contrib/examples
Commit message (Expand)AuthorAgeFilesLines
* various contrib: Fix links in man pagesStefan Beller2014-08-071-1/+1
* contrib/examples/git-resolve.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-091-1/+1
* contrib/examples/git-repack.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-091-2/+2
* contrib/examples/git-merge.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-091-2/+2
* contrib/examples/git-commit.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-091-2/+2
* contrib/examples/git-clone.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-091-1/+1
* Merge branch 'mh/ref-transaction'Junio C Hamano2014-06-031-1/+2
|\
| * refs.h: rename the action_on_err constantsMichael Haggerty2014-04-071-1/+2
* | Merge branch 'ep/shell-command-substitution'Junio C Hamano2014-04-2110-30/+30
|\ \
| * | git-tag.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-171-1/+1
| * | git-revert.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-171-1/+1
| * | git-resolve.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-171-1/+1
| * | git-repack.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-171-1/+1
| * | git-merge.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-171-2/+2
| * | git-ls-remote.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-171-2/+2
| * | git-fetch.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-171-3/+3
| * | git-commit.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-171-5/+5
| * | git-clone.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-171-10/+10
| * | git-checkout.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-171-4/+4
| |/
* | comments: fix misuses of "nor"Justin Lebar2014-03-312-3/+3
* | contrib: fix misuses of "nor"Justin Lebar2014-03-311-1/+1
|/
* repo-config: remove deprecated alias for "git config"John Keeping2013-11-121-2/+2
* Merge branch 'sb/repack-in-c'Junio C Hamano2013-10-181-0/+194
|\
| * repack: rewrite the shell script in CStefan Beller2013-09-171-0/+194
* | Merge branch 'rh/ishes-doc'Junio C Hamano2013-09-171-1/+1
|\ \
| * | use 'commit-ish' instead of 'committish'Richard Hansen2013-09-041-1/+1
| |/
* | core-tutorial: trim the section on Inspecting ChangesJunio C Hamano2013-08-132-0/+43
|/
* contrib/examples/git-remote.perl: use a lowercase "usage:" stringDavid Aguilar2013-02-241-4/+4
* contrib/examples: use a lowercase "usage:" stringDavid Aguilar2013-02-242-2/+2
* Merge branch 'jc/merge-bases'Junio C Hamano2012-09-111-1/+1
|\
| * in_merge_bases(): support only one "other" commitJunio C Hamano2012-08-271-1/+1
* | remove superfluous newlines in error messagesPete Wyckoff2012-04-301-2/+2
|/
* cherry-pick/revert: add support for -X/--strategy-optionJonathan Nieder2010-12-281-1/+12
* Change incorrect "remote branch" to "remote tracking branch" in C codeMatthieu Moy2010-11-031-1/+1
* Merge branch 'ab/require-perl-5.8'Junio C Hamano2010-10-261-1/+1
|\
| * perl: use "use warnings" instead of -wÆvar Arnfjörð Bjarmason2010-09-271-1/+1
* | {cvs,svn}import: use the new 'git read-tree --empty'Thomas Rast2010-10-191-1/+1
|/
* 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