aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'jk/symbolic-ref-maint' into maintJunio C Hamano2016-01-04
|\
| * symbolic-ref: propagate error code from create_symref()Jeff King2015-12-21
* | Merge branch 'rs/show-branch-argv-array' into maintJunio C Hamano2015-12-11
|\ \
| * | show-branch: use argv_array for default argumentsRené Scharfe2015-11-01
| |/
* | Merge branch 'rs/pop-commit' into maintJunio C Hamano2015-12-11
|\ \
| * | use pop_commit() for consuming the first entry of a struct commit_listRené Scharfe2015-10-26
* | | Merge branch 'dk/gc-idx-wo-pack' into maintJunio C Hamano2015-12-04
|\ \ \
| * | | gc: remove garbage .idx files from pack dirDoug Kelly2015-11-04
| * | | prepare_packed_git(): refactor garbage reporting in pack directoryJunio C Hamano2015-08-17
* | | | allow hooks to ignore their standard input streamClemens Buchacher2015-11-16
* | | | Merge branch 'js/misc-fixes' into maintJunio C Hamano2015-11-05
|\ \ \ \
| * | | | Correct fscanf formatting string for I64u valuesWaldek Maleska2015-10-26
* | | | | Merge branch 'jc/add-u-A-default-to-top' into maintJunio C Hamano2015-11-05
|\ \ \ \ \
| * | | | | add: simplify -u/-A without pathspecJunio C Hamano2015-10-24
* | | | | | Merge branch 'nd/clone-linked-checkout' into maintJunio C Hamano2015-11-05
|\ \ \ \ \ \
| * | | | | | clone: better error when --reference is a linked checkoutNguyễn Thái Ngọc Duy2015-09-28
| * | | | | | clone: allow --local from a linked checkoutNguyễn Thái Ngọc Duy2015-09-28
* | | | | | | Merge branch 'es/worktree-add' into maintJunio C Hamano2015-11-04
|\ \ \ \ \ \ \
| * | | | | | | worktree: usage: denote <branch> as optional with 'add'Sidhant Sharma2015-10-18
* | | | | | | | Merge branch 'mk/blame-error-message' into maintJunio C Hamano2015-11-03
|\ \ \ \ \ \ \ \
| * | | | | | | | blame: fix option name in error messageMax Kirillov2015-10-26
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/merge-file-exit-code' into maintJunio C Hamano2015-11-03
|\ \ \ \ \ \ \ \
| * | | | | | | | merge-file: clamp exit code to maximum 127Jeff King2015-10-29
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'jc/am-3-fallback-regression-fix' into maintJunio C Hamano2015-11-03
|\ \ \ \ \ \ \ \
| * | | | | | | | am -3: do not let failed merge from completing the error codepathJunio C Hamano2015-10-09
* | | | | | | | | Merge branch 'jc/usage-stdin' into maintJunio C Hamano2015-11-03
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | usage: do not insist that standard input must come from a fileJunio C Hamano2015-10-16
* | | | | | | | | | Merge branch 'rt/placeholder-in-usage' into maintJunio C Hamano2015-11-03
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | am, credential-cache: add angle brackets to usage stringRalf Thielow2015-10-16
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'nd/gc-auto-background-fix' into maintJunio C Hamano2015-11-03
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | gc: save log from daemonized gc --auto and print it next timeNguyễn Thái Ngọc Duy2015-09-21
* | | | | | | | | | | Merge branch 'js/clone-dissociate' into maintJunio C Hamano2015-11-03
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | clone --dissociate: avoid locking pack filesJohannes Schindelin2015-10-07
* | | | | | | | | | | | Merge branch 'tk/stripspace' into maintJunio C Hamano2015-11-03
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | stripspace: use parse-options for command-line parsingTobias Klauser2015-10-16
| * | | | | | | | | | | | strbuf: make stripspace() part of strbufTobias Klauser2015-10-16
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jk/repository-extension' into maintJunio C Hamano2015-11-03
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | introduce "preciousObjects" repository extensionJeff King2015-06-24
* | | | | | | | | | | | Merge branch 'nd/ls-remote-does-not-have-u-option' into maintJunio C Hamano2015-10-16
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | ls-remote.txt: delete unsupported optionNguyễn Thái Ngọc Duy2015-09-28
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jc/fsck-dropped-errors' into maintJunio C Hamano2015-10-16
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | fsck: exit with non-zero when problems are foundJunio C Hamano2015-09-23
* | | | | | | | | | | | | Merge branch 'pt/am-builtin' into maintJunio C Hamano2015-10-16
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | am: configure gpg at startupRenee Margaret McConahy2015-09-30
* | | | | | | | | | | | | | Merge branch 'jk/blame-first-parent' into maintJunio C Hamano2015-10-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | blame: handle --first-parentJeff King2015-09-16
* | | | | | | | | | | | | | | Merge branch 'pt/pull-builtin' into maintJunio C Hamano2015-10-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | pull: enclose <options> in brackets in the usage stringAlex Henrie2015-10-16
* | | | | | | | | | | | | | | Sync with v2.5.4Junio C Hamano2015-09-28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Sync with 2.4.10Junio C Hamano2015-09-28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |