summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'km/gc-eperm' into maintJunio C Hamano2014-01-131-1/+1
|\
| * gc: notice gc processes run by other userskm/gc-epermKyle J. McKay2014-01-021-1/+1
* | Merge branch 'mm/mv-file-to-no-such-dir-with-slash' into maintJunio C Hamano2014-01-131-7/+18
|\ \
| * | mv: let 'git mv file no-such-dir/' error out on Windows, toomm/mv-file-to-no-such-dir-with-slashJohannes Sixt2014-01-101-0/+2
| * | mv: let 'git mv file no-such-dir/' error outMatthieu Moy2013-12-041-7/+16
| |/
* | Merge branch 'jk/rev-parse-double-dashes' into maintJunio C Hamano2014-01-131-1/+15
|\ \
| * | rev-parse: be more careful with munging argumentsjk/rev-parse-double-dashesJeff King2013-12-091-1/+5
| * | rev-parse: correctly diagnose revision errors before "--"Jeff King2013-12-091-0/+10
| |/
* | Merge branch 'jk/cat-file-regression-fix' into maintJunio C Hamano2014-01-131-10/+20
|\ \
| * | cat-file: handle --batch format with missing type/sizejk/cat-file-regression-fixJeff King2013-12-121-1/+10
| * | cat-file: pass expand_data to print_object_or_dieJeff King2013-12-121-10/+11
| |/
* | for-each-ref: remove unused variableRamkumar Ramachandra2013-12-301-2/+1
* | Merge branch 'nd/magic-pathspec' into maintJunio C Hamano2013-12-171-10/+7
|\ \
| * | diff: restrict pathspec limitations to diff b/f case onlynd/magic-pathspecNguyễn Thái Ngọc Duy2013-11-201-10/+7
* | | cmd_repack(): remove redundant local variable "nr_packs"Michael Haggerty2013-12-171-4/+2
| |/ |/|
* | Merge branch 'nd/literal-pathspecs'Junio C Hamano2013-11-181-1/+3
|\ \
| * | pathspec: stop --*-pathspecs impact on internal parse_pathspec() usesnd/literal-pathspecsnd/liteal-pathspecsNguyễn Thái Ngọc Duy2013-10-281-1/+3
* | | Merge branch 'jx/branch-vv-always-compare-with-upstream'Junio C Hamano2013-11-181-1/+7
|\ \ \
| * | | branch: fix --verbose output column alignmentjx/branch-vv-always-compare-with-upstreamTorstein Hegge2013-11-181-1/+7
* | | | 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
View Lorry Controller Status