Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rs/parseopt-short-help' | Junio C Hamano | 2015-12-04 | 2 | -27/+2 |
|\ | |||||
| * | show-ref: stop using PARSE_OPT_NO_INTERNAL_HELPrs/parseopt-short-help | René Scharfe | 2015-11-20 | 1 | -11/+1 |
| * | grep: stop using PARSE_OPT_NO_INTERNAL_HELP | René Scharfe | 2015-11-20 | 1 | -16/+1 |
* | | Merge branch 'mk/blame-first-parent' | Jeff King | 2015-12-01 | 1 | -16/+14 |
|\ \ | |||||
| * | | blame: fix object casting regression | Jeff King | 2015-11-24 | 1 | -16/+14 |
* | | | Merge branch 'maint' | Jeff King | 2015-12-01 | 1 | -0/+3 |
|\ \ \ | |_|/ |/| | | |||||
| * | | allow hooks to ignore their standard input streamcb/hook-sigpipe | Clemens Buchacher | 2015-11-16 | 1 | -0/+3 |
| * | | Merge branch 'js/misc-fixes' into maint | Junio C Hamano | 2015-11-05 | 1 | -1/+1 |
| |\ \ | |||||
| * \ \ | Merge branch 'jc/add-u-A-default-to-top' into maint | Junio C Hamano | 2015-11-05 | 1 | -7/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'nd/clone-linked-checkout' into maint | Junio C Hamano | 2015-11-05 | 1 | -3/+10 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'es/worktree-add' into maint | Junio C Hamano | 2015-11-04 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'mk/blame-error-message' into maint | Junio C Hamano | 2015-11-03 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'jk/merge-file-exit-code' into maint | Junio C Hamano | 2015-11-03 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jc/am-3-fallback-regression-fix' into maint | Junio C Hamano | 2015-11-03 | 1 | -16/+33 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jc/usage-stdin' into maint | Junio C Hamano | 2015-11-03 | 11 | -12/+12 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'rt/placeholder-in-usage' into maint | Junio C Hamano | 2015-11-03 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/gc-auto-background-fix' into maint | Junio C Hamano | 2015-11-03 | 1 | -1/+55 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/clone-dissociate' into maint | Junio C Hamano | 2015-11-03 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tk/stripspace' into maint | Junio C Hamano | 2015-11-03 | 7 | -102/+42 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/repository-extension' into maint | Junio C Hamano | 2015-11-03 | 3 | -9/+17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'lf/ref-is-hidden-namespace' | Jeff King | 2015-11-20 | 1 | -6/+21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | hideRefs: add support for matching full refs | Lukas Fleischer | 2015-11-05 | 1 | -6/+21 |
* | | | | | | | | | | | | | | | | | Merge branch 'dk/gc-idx-wo-pack' | Jeff King | 2015-11-20 | 2 | -2/+45 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | gc: remove garbage .idx files from pack dirdk/gc-idx-wo-pack | Doug Kelly | 2015-11-04 | 1 | -0/+21 |
| * | | | | | | | | | | | | | | | | | prepare_packed_git(): refactor garbage reporting in pack directory | Junio C Hamano | 2015-08-17 | 1 | -2/+24 |
* | | | | | | | | | | | | | | | | | | Merge branch 'ea/checkout-progress' | Junio C Hamano | 2015-11-05 | 1 | -2/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | checkout: add --progress optionea/checkout-progress | Edmundo Carmona Antoranz | 2015-11-01 | 1 | -2/+12 |
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge branch 'mk/blame-first-parent' | Junio C Hamano | 2015-11-03 | 1 | -14/+47 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | blame: allow blame --reverse --first-parent when it makes sensemk/blame-first-parent | Max Kirillov | 2015-10-30 | 1 | -2/+30 |
| * | | | | | | | | | | | | | | | | blame: extract find_single_final | Max Kirillov | 2015-10-30 | 1 | -12/+17 |
* | | | | | | | | | | | | | | | | | Merge branch 'rs/show-branch-argv-array' | Junio C Hamano | 2015-11-03 | 1 | -16/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | show-branch: use argv_array for default argumentsrs/show-branch-argv-array | René Scharfe | 2015-11-01 | 1 | -16/+8 |
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/merge-file-exit-code' | Junio C Hamano | 2015-10-30 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | merge-file: clamp exit code to maximum 127jk/merge-file-exit-code | Jeff King | 2015-10-29 | 1 | -0/+3 |
* | | | | | | | | | | | | | | | | | | Merge branch 'rs/pop-commit' | Junio C Hamano | 2015-10-30 | 5 | -37/+14 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | use pop_commit() for consuming the first entry of a struct commit_listrs/pop-commit | René Scharfe | 2015-10-26 | 5 | -37/+14 |
* | | | | | | | | | | | | | | | | | | | Merge branch 'mk/blame-error-message' | Junio C Hamano | 2015-10-30 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | blame: fix option name in error messagemk/blame-error-message | Max Kirillov | 2015-10-26 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | Merge branch 'js/misc-fixes' | Junio C Hamano | 2015-10-30 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | Correct fscanf formatting string for I64u valuesjs/misc-fixes | Waldek Maleska | 2015-10-26 | 1 | -1/+1 |
| |/ / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | Merge branch 'jc/add-u-A-default-to-top' | Junio C Hamano | 2015-10-30 | 1 | -7/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | add: simplify -u/-A without pathspecjc/add-u-A-default-to-top | Junio C Hamano | 2015-10-24 | 1 | -7/+1 |
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge branch 'ar/clone-dissociate' | Junio C Hamano | 2015-10-30 | 1 | -8/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | clone: allow "--dissociate" without referencear/clone-dissociate | Alex Riesen | 2015-10-22 | 1 | -8/+8 |
* | | | | | | | | | | | | | | | | | | Merge branch 'jc/am-mailinfo-direct' | Junio C Hamano | 2015-10-29 | 1 | -19/+23 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | am: make direct call to mailinfojc/am-mailinfo-direct | Junio C Hamano | 2015-10-21 | 1 | -19/+23 |
* | | | | | | | | | | | | | | | | | | | Merge branch 'jc/mailinfo-lib' | Junio C Hamano | 2015-10-29 | 1 | -1035/+20 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | mailinfo: libify | Junio C Hamano | 2015-10-21 | 1 | -1048/+1 |
| * | | | | | | | | | | | | | | | | | | mailinfo: keep the parsed log message in a strbuf | Junio C Hamano | 2015-10-21 | 1 | -12/+16 |
| * | | | | | | | | | | | | | | | | | | mailinfo: handle_commit_msg() shouldn't be called after finding patchbreak | Junio C Hamano | 2015-10-21 | 1 | -2/+1 |