summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge branch 'jk/sha1write-void'Junio C Hamano2014-01-101-2/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | do not pretend sha1write returns errorsjk/sha1write-voidJeff King2013-12-261-2/+0
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'nd/add-empty-fix'Junio C Hamano2014-01-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | add: don't complain when adding empty project rootnd/add-empty-fixNguyễn Thái Ngọc Duy2013-12-261-1/+1
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'tm/fetch-prune'Junio C Hamano2014-01-101-10/+32
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fetch --prune: Run prune before fetchingtm/fetch-pruneTom Miller2014-01-031-5/+5
| * | | | | | | | | | | fetch --prune: always print header urlTom Miller2014-01-031-5/+27
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'mh/path-max'Junio C Hamano2014-01-102-31/+45
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | builtin/prune.c: use strbuf to avoid having to worry about PATH_MAXmh/path-maxJeff King2013-12-181-14/+24
| * | | | | | | | | | | prune-packed: use strbuf to avoid having to worry about PATH_MAXJunio C Hamano2013-12-171-17/+21
* | | | | | | | | | | | Merge branch 'cc/replace-object-info'Junio C Hamano2014-01-102-8/+61
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | replace info: rename 'full' to 'long' and clarify in-code symbolscc/replace-object-infoChristian Couder2013-12-301-10/+14
| * | | | | | | | | | | | builtin/replace: unset read_replace_refsChristian Couder2013-12-121-0/+2
| * | | | | | | | | | | | builtin/replace: teach listing using short, medium or full formatsChristian Couder2013-12-121-7/+54
| * | | | | | | | | | | | sha1_object_info_extended(): add an "unsigned flags" parameterChristian Couder2013-12-121-1/+1
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'nd/negative-pathspec'Junio C Hamano2014-01-101-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Support pathspec magic :(exclude) and its short form :!Nguyễn Thái Ngọc Duy2013-12-061-1/+4
* | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2013-12-301-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
| * | | | | | | | | | | for-each-ref: remove unused variableRamkumar Ramachandra2013-12-301-2/+1
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'tg/diff-no-index-refactor'Junio C Hamano2013-12-271-5/+53
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | diff: avoid some nestingtg/diff-no-index-refactorThomas Gummerer2013-12-161-18/+17
| * | | | | | | | | | | diff: don't read index when --no-index is givenThomas Gummerer2013-12-121-2/+5
| * | | | | | | | | | | diff: move no-index detection to builtin/diff.cThomas Gummerer2013-12-121-3/+49
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/cat-file-regression-fix'Junio C Hamano2013-12-271-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
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'jk/rev-parse-double-dashes'Junio C Hamano2013-12-271-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 'jc/push-refmap'Junio C Hamano2013-12-271-22/+62
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | push: also use "upstream" mapping when pushing a single refjc/push-refmapJunio C Hamano2013-12-041-0/+11
| * | | | | | | | push: use remote.$name.push as a refmapJunio C Hamano2013-12-041-2/+38
| * | | | | | | | builtin/push.c: use strbuf instead of manual allocationJunio C Hamano2013-12-031-21/+14
| |/ / / / / / /
* | | | | | | | Sync with 1.8.5.2Junio C Hamano2013-12-171-4/+2
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch 'nd/magic-pathspec' into maintJunio C Hamano2013-12-171-10/+7
| |\ \ \ \ \ \ \
| * | | | | | | | cmd_repack(): remove redundant local variable "nr_packs"Michael Haggerty2013-12-171-4/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'tb/clone-ssh-with-colon-for-port'Junio C Hamano2013-12-171-3/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | git fetch-pack: add --diag-urlTorsten Bögershausen2013-12-091-3/+11
* | | | | | | | | Merge branch 'nd/transport-positive-depth-only'Junio C Hamano2013-12-172-0/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | clone,fetch: catch non positive --depth option valuend/transport-positive-depth-onlyNguyễn Thái Ngọc Duy2013-12-062-0/+8
| | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Merge branch 'mm/checkout-auto-track-fix' into maintJunio C Hamano2013-11-071-28/+71
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/clone-progress-to-stderr' into maintJunio C Hamano2013-10-281-23/+21
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/shortlog-tolerate-broken-commit' into maintJunio C Hamano2013-10-281-2/+4
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/ls-files-killed-optim' into maintJunio C Hamano2013-10-231-0/+2
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/fetch-into-shallow' into maintJunio C Hamano2013-10-232-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cc/starts-n-ends-with'Junio C Hamano2013-12-1741-160/+152
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | replace {pre,suf}fixcmp() with {starts,ends}_with()cc/starts-n-ends-withChristian Couder2013-12-0541-148/+148
| * | | | | | | | | | | | | | builtin/remote: remove postfixcmp() and use suffixcmp() insteadChristian Couder2013-12-051-11/+3
* | | | | | | | | | | | | | | Merge branch 'jl/commit-v-strip-marker'Junio C Hamano2013-12-171-6/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | commit -v: strip diffs and submodule shortlogs from the commit messagejl/commit-v-strip-markerJens Lehmann2013-12-051-6/+3
| | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |