summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs/parseopt-short-help'Junio C Hamano2015-12-042-27/+2
|\
| * show-ref: stop using PARSE_OPT_NO_INTERNAL_HELPrs/parseopt-short-helpRené Scharfe2015-11-201-11/+1
| * grep: stop using PARSE_OPT_NO_INTERNAL_HELPRené Scharfe2015-11-201-16/+1
* | Merge branch 'mk/blame-first-parent'Jeff King2015-12-011-16/+14
|\ \
| * | blame: fix object casting regressionJeff King2015-11-241-16/+14
* | | Merge branch 'maint'Jeff King2015-12-011-0/+3
|\ \ \ | |_|/ |/| |
| * | allow hooks to ignore their standard input streamcb/hook-sigpipeClemens Buchacher2015-11-161-0/+3
| * | Merge branch 'js/misc-fixes' into maintJunio C Hamano2015-11-051-1/+1
| |\ \
| * \ \ Merge branch 'jc/add-u-A-default-to-top' into maintJunio C Hamano2015-11-051-7/+1
| |\ \ \
| * \ \ \ Merge branch 'nd/clone-linked-checkout' into maintJunio C Hamano2015-11-051-3/+10
| |\ \ \ \
| * \ \ \ \ Merge branch 'es/worktree-add' into maintJunio C Hamano2015-11-041-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'mk/blame-error-message' into maintJunio C Hamano2015-11-031-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/merge-file-exit-code' into maintJunio C Hamano2015-11-031-0/+3
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jc/am-3-fallback-regression-fix' into maintJunio C Hamano2015-11-031-16/+33
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/usage-stdin' into maintJunio C Hamano2015-11-0311-12/+12
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'rt/placeholder-in-usage' into maintJunio C Hamano2015-11-031-2/+2
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/gc-auto-background-fix' into maintJunio C Hamano2015-11-031-1/+55
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/clone-dissociate' into maintJunio C Hamano2015-11-031-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tk/stripspace' into maintJunio C Hamano2015-11-037-102/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/repository-extension' into maintJunio C Hamano2015-11-033-9/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'lf/ref-is-hidden-namespace'Jeff King2015-11-201-6/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | hideRefs: add support for matching full refsLukas Fleischer2015-11-051-6/+21
* | | | | | | | | | | | | | | | | Merge branch 'dk/gc-idx-wo-pack'Jeff King2015-11-202-2/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | gc: remove garbage .idx files from pack dirdk/gc-idx-wo-packDoug Kelly2015-11-041-0/+21
| * | | | | | | | | | | | | | | | | prepare_packed_git(): refactor garbage reporting in pack directoryJunio C Hamano2015-08-171-2/+24
* | | | | | | | | | | | | | | | | | Merge branch 'ea/checkout-progress'Junio C Hamano2015-11-051-2/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | checkout: add --progress optionea/checkout-progressEdmundo Carmona Antoranz2015-11-011-2/+12
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'mk/blame-first-parent'Junio C Hamano2015-11-031-14/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | blame: allow blame --reverse --first-parent when it makes sensemk/blame-first-parentMax Kirillov2015-10-301-2/+30
| * | | | | | | | | | | | | | | | blame: extract find_single_finalMax Kirillov2015-10-301-12/+17
* | | | | | | | | | | | | | | | | Merge branch 'rs/show-branch-argv-array'Junio C Hamano2015-11-031-16/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | show-branch: use argv_array for default argumentsrs/show-branch-argv-arrayRené Scharfe2015-11-011-16/+8
* | | | | | | | | | | | | | | | | | Merge branch 'jk/merge-file-exit-code'Junio C Hamano2015-10-301-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | merge-file: clamp exit code to maximum 127jk/merge-file-exit-codeJeff King2015-10-291-0/+3
* | | | | | | | | | | | | | | | | | Merge branch 'rs/pop-commit'Junio C Hamano2015-10-305-37/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | use pop_commit() for consuming the first entry of a struct commit_listrs/pop-commitRené Scharfe2015-10-265-37/+14
* | | | | | | | | | | | | | | | | | | Merge branch 'mk/blame-error-message'Junio C Hamano2015-10-301-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | blame: fix option name in error messagemk/blame-error-messageMax Kirillov2015-10-261-1/+1
* | | | | | | | | | | | | | | | | | | Merge branch 'js/misc-fixes'Junio C Hamano2015-10-301-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Correct fscanf formatting string for I64u valuesjs/misc-fixesWaldek Maleska2015-10-261-1/+1
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'jc/add-u-A-default-to-top'Junio C Hamano2015-10-301-7/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | add: simplify -u/-A without pathspecjc/add-u-A-default-to-topJunio C Hamano2015-10-241-7/+1
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'ar/clone-dissociate'Junio C Hamano2015-10-301-8/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | clone: allow "--dissociate" without referencear/clone-dissociateAlex Riesen2015-10-221-8/+8
* | | | | | | | | | | | | | | | | | Merge branch 'jc/am-mailinfo-direct'Junio C Hamano2015-10-291-19/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | am: make direct call to mailinfojc/am-mailinfo-directJunio C Hamano2015-10-211-19/+23
* | | | | | | | | | | | | | | | | | | Merge branch 'jc/mailinfo-lib'Junio C Hamano2015-10-291-1035/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | mailinfo: libifyJunio C Hamano2015-10-211-1048/+1
| * | | | | | | | | | | | | | | | | | mailinfo: keep the parsed log message in a strbufJunio C Hamano2015-10-211-12/+16
| * | | | | | | | | | | | | | | | | | mailinfo: handle_commit_msg() shouldn't be called after finding patchbreakJunio C Hamano2015-10-211-2/+1