summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* tar-tree: remove deprecated commandJohn Keeping2013-11-121-62/+0
* repo-config: remove deprecated alias for "git config"John Keeping2013-11-121-6/+0
* Merge branch 'fc/trivial'Junio C Hamano2013-11-064-16/+7
|\
| * diff: trivial style fixFelipe Contreras2013-10-311-1/+1
| * describe: trivial style fixesFelipe Contreras2013-10-311-4/+3
| * branch: trivial style fixFelipe Contreras2013-10-311-2/+1
| * merge: simplify ff-only optionFelipe Contreras2013-10-311-9/+2
* | Merge branch 'jk/reset-p-current-head-fix'Junio C Hamano2013-11-011-1/+1
|\ \
| * | reset: pass real rev name to add--interactivejk/reset-p-current-head-fixJeff King2013-10-251-1/+1
* | | Merge branch 'jk/for-each-ref-skip-parsing'Junio C Hamano2013-11-011-9/+20
|\ \ \
| * | | for-each-ref: avoid loading objects to print %(objectname)jk/for-each-ref-skip-parsingJeff King2013-10-301-9/+20
* | | | Merge branch 'jl/submodule-mv'Junio C Hamano2013-11-011-4/+9
|\ \ \ \ | |_|_|/ |/| | |
| * | | mv: Fix spurious warning when moving a file in presence of submodulesjl/submodule-mvJens Lehmann2013-10-131-4/+9
* | | | Merge branch 'nd/lift-path-max'Junio C Hamano2013-10-301-1/+1
|\ \ \ \
| * | | | checkout_entry(): clarify the use of topath[] parameternd/lift-path-maxJunio C Hamano2013-10-241-1/+1
| * | | | Merge branch 'ap/commit-author-mailmap' into maintJunio C Hamano2013-10-171-1/+7
| |\ \ \ \
* | \ \ \ \ Merge branch 'nd/gc-lock-against-each-other'Junio C Hamano2013-10-301-0/+24
|\ \ \ \ \ \
| * | | | | | gc: remove gc.pid file at end of executionnd/gc-lock-against-each-otherJonathan Nieder2013-10-181-0/+24
* | | | | | | Merge branch 'mm/checkout-auto-track-fix'Junio C Hamano2013-10-301-28/+71
|\ \ \ \ \ \ \
| * | | | | | | checkout: proper error message on 'git checkout foo bar --'mm/checkout-auto-track-fixMatthieu Moy2013-10-181-5/+16
| * | | | | | | checkout: allow dwim for branch creation for "git checkout $branch --"Matthieu Moy2013-10-181-23/+55
* | | | | | | | Merge branch 'fc/styles'Junio C Hamano2013-10-303-3/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | C: have space around && and || operatorsJunio C Hamano2013-10-163-3/+3
* | | | | | | | Merge branch 'hu/cherry-pick-previous-branch'Junio C Hamano2013-10-231-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | cherry-pick: handle "-" after parsing optionshu/cherry-pick-previous-branchJeff King2013-10-101-2/+2
* | | | | | | | | Merge branch 'mg/more-textconv'Junio C Hamano2013-10-233-18/+39
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | grep: honor --textconv for the case rev:pathmg/more-textconvMichael J Gruber2013-05-101-5/+6
| * | | | | | | | | grep: allow to use textconv filtersJeff King2013-05-101-0/+2
| * | | | | | | | | cat-file: do not die on --textconv without textconv filtersMichael J Gruber2013-05-101-10/+8
| * | | | | | | | | show: honor --textconv for blobsMichael J Gruber2013-05-101-3/+22
| * | | | | | | | | diff_opt: track whether flags have been set explicitlyJunio C Hamano2013-05-101-0/+1
* | | | | | | | | | Merge branch 'jc/pack-objects'Junio C Hamano2013-10-231-11/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | pack-objects: shrink struct object_entryjc/pack-objectsJunio C Hamano2013-02-041-11/+12
* | | | | | | | | | | Merge branch 'sb/repack-in-c'Junio C Hamano2013-10-181-0/+388
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | repack: improve warnings about failure of renaming and removing filesStefan Beller2013-09-171-2/+3
| * | | | | | | | | | | repack: retain the return value of pack-objectsStefan Beller2013-09-171-2/+2
| * | | | | | | | | | | repack: rewrite the shell script in CStefan Beller2013-09-171-0/+387
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/clone-progress-to-stderr'Junio C Hamano2013-10-181-23/+21
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | clone: always set transport optionsjk/clone-progress-to-stderrJeff King2013-09-181-16/+14
| * | | | | | | | | | | clone: treat "checking connectivity" like other progressJeff King2013-09-181-2/+2
| * | | | | | | | | | | clone: send diagnostic messages to stderrJeff King2013-09-181-5/+5
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'jk/trailing-slash-in-pathspec'Junio C Hamano2013-10-172-18/+10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | reset: handle submodule with trailing slashjk/trailing-slash-in-pathspecJohn Keeping2013-09-131-2/+6
| * | | | | | | | | | | rm: re-use parse_pathspec's trailing-slash removalJohn Keeping2013-09-131-16/+4
* | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2013-10-151-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | / / / | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| * | | | | | | | | | clone --branch: refuse to clone if upstream repo is emptyRalf Thielow2013-10-141-0/+4
* | | | | | | | | | | Merge branch 'po/remote-set-head-usage'Jonathan Nieder2013-10-141-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | remote set-head -h: add long options to synopsispo/remote-set-head-usagePhilip Oakley2013-09-271-2/+2
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'cc/replace-with-the-same-type'Jonathan Nieder2013-09-241-3/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | replace: allow long option namesChristian Couder2013-09-061-3/+3
View Lorry Controller Status