summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* index-pack: report error using the correct variablend/index-pack-error-messageJunio C Hamano2014-03-171-2/+2
* Merge branch 'bm/merge-base-octopus-dedup' into maintJunio C Hamano2014-02-131-6/+25
|\
| * merge-base --octopus: reduce the result from get_octopus_merge_bases()bm/merge-base-octopus-dedupJunio C Hamano2013-12-301-1/+1
| * merge-base: separate "--independent" codepath into its own helperJunio C Hamano2013-12-301-6/+25
* | Merge branch 'sb/repack-in-c' into maintJunio C Hamano2014-02-131-12/+12
|\ \
| * | repack: propagate pack-objects options as stringssb/repack-in-cJeff King2014-01-231-11/+11
| * | repack: make parsed string options const-correctJeff King2014-01-231-1/+1
| * | repack: fix typo in max-pack-size optionJeff King2014-01-231-1/+1
* | | Merge branch 'js/lift-parent-count-limit' into maintJunio C Hamano2014-02-051-4/+4
|\ \ \
| * | | Remove the line length limit for graft filesjs/lift-parent-count-limitJohannes Schindelin2013-12-271-4/+4
* | | | Merge branch 'nd/add-empty-fix' into maintJunio C Hamano2014-02-051-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 'jl/commit-v-strip-marker' into maintJunio C Hamano2014-02-051-6/+3
|\ \ \ \ \
| * | | | | commit -v: strip diffs and submodule shortlogs from the commit messagejl/commit-v-strip-markerJens Lehmann2013-12-051-6/+3
| |/ / / /
* | | | | Merge branch 'tb/clone-ssh-with-colon-for-port' into maintJunio C Hamano2014-02-051-3/+11
|\ \ \ \ \
| * | | | | git fetch-pack: add --diag-urlTorsten Bögershausen2013-12-091-3/+11
* | | | | | Merge branch 'nd/transport-positive-depth-only' into maintJunio C Hamano2014-02-052-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 '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
|\ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status