summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Sync with 2.6.2Junio C Hamano2015-10-161-1/+1
|\
| * Merge branch 'nd/ls-remote-does-not-have-u-option' into maintJunio C Hamano2015-10-161-1/+1
| |\
| * \ Merge branch 'jc/fsck-dropped-errors' into maintJunio C Hamano2015-10-161-4/+14
| |\ \
| * \ \ Merge branch 'pt/am-builtin' into maintJunio C Hamano2015-10-161-1/+12
| |\ \ \
| * \ \ \ Merge branch 'jk/blame-first-parent' into maintJunio C Hamano2015-10-161-1/+10
| |\ \ \ \
| * \ \ \ \ Merge branch 'pt/pull-builtin' into maintJunio C Hamano2015-10-161-1/+1
| |\ \ \ \ \
| | * | | | | pull: enclose <options> in brackets in the usage stringpt/pull-builtinAlex Henrie2015-10-161-1/+1
* | | | | | | Merge branch 'js/clone-dissociate'Junio C Hamano2015-10-151-1/+3
|\ \ \ \ \ \ \
| * | | | | | | clone --dissociate: avoid locking pack filesjs/clone-dissociateJohannes Schindelin2015-10-071-1/+3
* | | | | | | | Merge branch 'pt/am-builtin'Junio C Hamano2015-10-151-1/+12
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | am: configure gpg at startuppt/am-builtinRenee Margaret McConahy2015-09-301-1/+12
* | | | | | | | Merge branch 'nd/clone-linked-checkout'Junio C Hamano2015-10-151-3/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | clone: better error when --reference is a linked checkoutnd/clone-linked-checkoutNguyễn Thái Ngọc Duy2015-09-281-1/+6
| * | | | | | | | clone: allow --local from a linked checkoutNguyễn Thái Ngọc Duy2015-09-281-2/+4
* | | | | | | | | Merge branch 'kn/for-each-branch'Junio C Hamano2015-10-151-352/+150
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | branch: add '--points-at' optionKarthik Nayak2015-09-251-1/+6
| * | | | | | | | | branch.c: use 'ref-filter' APIsKarthik Nayak2015-09-251-178/+35
| * | | | | | | | | branch.c: use 'ref-filter' data structuresKarthik Nayak2015-09-251-189/+128
| * | | | | | | | | branch: drop non-commit error reportingKarthik Nayak2015-09-251-14/+4
| * | | | | | | | | branch: move 'current' check down to the presentation layerKarthik Nayak2015-09-231-11/+9
| * | | | | | | | | branch: roll show_detached HEAD into regular ref_listKarthik Nayak2015-09-231-28/+33
| * | | | | | | | | branch: bump get_head_description() to the topKarthik Nayak2015-09-231-31/+31
| * | | | | | | | | branch: refactor width computationKarthik Nayak2015-09-231-30/+34
* | | | | | | | | | Merge branch 'jc/fsck-dropped-errors'Junio C Hamano2015-10-151-4/+14
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | fsck: exit with non-zero when problems are foundjc/fsck-dropped-errorsJunio C Hamano2015-09-231-4/+14
* | | | | | | | | | Merge branch 'nd/gc-auto-background-fix'Junio C Hamano2015-10-151-1/+55
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | gc: save log from daemonized gc --auto and print it next timend/gc-auto-background-fixNguyễn Thái Ngọc Duy2015-09-211-1/+55
* | | | | | | | | | | Merge branch 'nd/ls-remote-does-not-have-u-option'Junio C Hamano2015-10-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | ls-remote.txt: delete unsupported optionnd/ls-remote-does-not-have-u-optionNguyễn Thái Ngọc Duy2015-09-281-1/+1
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Sync with 2.6.1Junio C Hamano2015-10-054-8/+17
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | Sync with v2.5.4Junio C Hamano2015-09-284-8/+17
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Sync with 2.4.10Junio C Hamano2015-09-284-8/+17
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Sync with 2.3.10Junio C Hamano2015-09-284-8/+17
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | merge-file: enforce MAX_XDIFF_SIZE on incoming filesJeff King2015-09-281-1/+2
| | | | * | | | | | | | react to errors in xdi_diffJeff King2015-09-283-7/+15
| | | | |/ / / / / / /
* | | | | | | | | | | Merge branch 'bb/remote-get-url'Junio C Hamano2015-10-051-0/+59
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | remote: add get-url subcommandbb/remote-get-urlBen Boeckel2015-09-171-0/+59
* | | | | | | | | | | | Merge branch 'jk/blame-first-parent'Junio C Hamano2015-10-051-1/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | blame: handle --first-parentjk/blame-first-parentJeff King2015-09-161-1/+10
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'sb/submodule-helper'Junio C Hamano2015-10-051-0/+282
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | submodule: rewrite `module_clone` shell function in Csb/submodule-helperStefan Beller2015-09-081-0/+132
| * | | | | | | | | | | submodule: rewrite `module_name` shell function in CStefan Beller2015-09-031-0/+22
| * | | | | | | | | | | submodule: rewrite `module_list` shell function in CStefan Beller2015-09-031-0/+128
| * | | | | | | | | | | Merge 'hv/submodule-config' to 'sb/submodule-helper'Junio C Hamano2015-08-192-0/+2
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'kn/for-each-tag'Junio C Hamano2015-10-052-304/+67
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | tag.c: implement '--merged' and '--no-merged' optionsKarthik Nayak2015-09-171-1/+5
| * | | | | | | | | | | | tag.c: implement '--format' optionKarthik Nayak2015-09-171-10/+15
| * | | | | | | | | | | | tag.c: use 'ref-filter' APIsKarthik Nayak2015-09-171-302/+43
| * | | | | | | | | | | | tag.c: use 'ref-filter' data structuresKarthik Nayak2015-09-171-49/+57
| * | | | | | | | | | | | ref-filter: add option to match literal patternKarthik Nayak2015-09-171-0/+1
View Lorry Controller Status