summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'mm/mv-file-to-no-such-dir-with-slash'Junio C Hamano2013-12-171-7/+16
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | mv: let 'git mv file no-such-dir/' error outMatthieu Moy2013-12-041-7/+16
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'fc/trivial'Junio C Hamano2013-12-171-2/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | remote: fix status with branch...rebase=preservefc/trivialFelipe Contreras2013-12-091-2/+7
* | | | | | | | | | | | Merge branch 'jk/remove-deprecated'Junio C Hamano2013-12-123-108/+40
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Sync with 1.8.5jk/remove-deprecatedJunio C Hamano2013-12-052-2/+10
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | stop installing git-tar-tree linkJonathan Nieder2013-12-031-0/+0
| * | | | | | | | | | | 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 'mh/fetch-tags-in-addition-to-normal-refs'Junio C Hamano2013-12-122-246/+248
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | ref_remove_duplicates(): simplify loop logicMichael Haggerty2013-10-301-3/+1
| * | | | | | | | | | | fetch, remote: properly convey --no-prune options to subprocessesMichael Haggerty2013-10-302-5/+5
| * | | | | | | | | | | builtin/remote.c:update(): use struct argv_arrayMichael Haggerty2013-10-301-16/+17
| * | | | | | | | | | | builtin/remote.c: reorder function definitionsMichael Haggerty2013-10-301-81/+78
| * | | | | | | | | | | fetch --prune: prune only based on explicit refspecsMichael Haggerty2013-10-301-30/+9
| * | | | | | | | | | | fetch --tags: fetch tags *in addition to* other stuffMichael Haggerty2013-10-301-24/+35
| * | | | | | | | | | | fetch: only opportunistically update references based on command lineMichael Haggerty2013-10-301-12/+32
| * | | | | | | | | | | builtin/fetch.c: reorder function definitionsMichael Haggerty2013-10-301-101/+97
| * | | | | | | | | | | get_ref_map(): rename local variablesMichael Haggerty2013-10-241-6/+6
* | | | | | | | | | | | Merge branch 'nd/magic-pathspec'Junio C Hamano2013-12-061-10/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | diff: restrict pathspec limitations to diff b/f case onlynd/magic-pathspecNguyễn Thái Ngọc Duy2013-11-201-10/+7
* | | | | | | | | | | | Merge branch 'rr/for-each-ref-decoration'Junio C Hamano2013-12-061-13/+81
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | for-each-ref: avoid color leakagerr/for-each-ref-decorationRamkumar Ramachandra2013-11-191-5/+23
View Lorry Controller Status