Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'rs/show-branch-argv-array' into maint | Junio C Hamano | 2015-12-11 |
|\ | |||
| * | show-branch: use argv_array for default arguments | René Scharfe | 2015-11-01 |
* | | Merge branch 'rs/pop-commit' into maint | Junio C Hamano | 2015-12-11 |
|\ \ | |||
| * | | use pop_commit() for consuming the first entry of a struct commit_list | René Scharfe | 2015-10-26 |
* | | | Merge branch 'dk/gc-idx-wo-pack' into maint | Junio C Hamano | 2015-12-04 |
|\ \ \ | |||
| * | | | gc: remove garbage .idx files from pack dir | Doug Kelly | 2015-11-04 |
| * | | | prepare_packed_git(): refactor garbage reporting in pack directory | Junio C Hamano | 2015-08-17 |
* | | | | allow hooks to ignore their standard input stream | Clemens Buchacher | 2015-11-16 |
* | | | | Merge branch 'js/misc-fixes' into maint | Junio C Hamano | 2015-11-05 |
|\ \ \ \ | |||
| * | | | | Correct fscanf formatting string for I64u values | Waldek Maleska | 2015-10-26 |
* | | | | | Merge branch 'jc/add-u-A-default-to-top' into maint | Junio C Hamano | 2015-11-05 |
|\ \ \ \ \ | |||
| * | | | | | add: simplify -u/-A without pathspec | Junio C Hamano | 2015-10-24 |
* | | | | | | Merge branch 'nd/clone-linked-checkout' into maint | Junio C Hamano | 2015-11-05 |
|\ \ \ \ \ \ | |||
| * | | | | | | clone: better error when --reference is a linked checkout | Nguyễn Thái Ngọc Duy | 2015-09-28 |
| * | | | | | | clone: allow --local from a linked checkout | Nguyễn Thái Ngọc Duy | 2015-09-28 |
* | | | | | | | Merge branch 'es/worktree-add' into maint | Junio C Hamano | 2015-11-04 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | worktree: usage: denote <branch> as optional with 'add' | Sidhant Sharma | 2015-10-18 |
* | | | | | | | | Merge branch 'mk/blame-error-message' into maint | Junio C Hamano | 2015-11-03 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | blame: fix option name in error message | Max Kirillov | 2015-10-26 |
| | |_|_|/ / / / | |/| | | | | | | |||
* | | | | | | | | Merge branch 'jk/merge-file-exit-code' into maint | Junio C Hamano | 2015-11-03 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | merge-file: clamp exit code to maximum 127 | Jeff King | 2015-10-29 |
| | |_|_|/ / / / | |/| | | | | | | |||
* | | | | | | | | Merge branch 'jc/am-3-fallback-regression-fix' into maint | Junio C Hamano | 2015-11-03 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | am -3: do not let failed merge from completing the error codepath | Junio C Hamano | 2015-10-09 |
* | | | | | | | | | Merge branch 'jc/usage-stdin' into maint | Junio C Hamano | 2015-11-03 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | usage: do not insist that standard input must come from a file | Junio C Hamano | 2015-10-16 |
* | | | | | | | | | | Merge branch 'rt/placeholder-in-usage' into maint | Junio C Hamano | 2015-11-03 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | am, credential-cache: add angle brackets to usage string | Ralf Thielow | 2015-10-16 |
| | |/ / / / / / / / | |/| | | | | | | | | |||
* | | | | | | | | | | Merge branch 'nd/gc-auto-background-fix' into maint | Junio C Hamano | 2015-11-03 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | gc: save log from daemonized gc --auto and print it next time | Nguyễn Thái Ngọc Duy | 2015-09-21 |
* | | | | | | | | | | | Merge branch 'js/clone-dissociate' into maint | Junio C Hamano | 2015-11-03 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | clone --dissociate: avoid locking pack files | Johannes Schindelin | 2015-10-07 |
* | | | | | | | | | | | | Merge branch 'tk/stripspace' into maint | Junio C Hamano | 2015-11-03 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | stripspace: use parse-options for command-line parsing | Tobias Klauser | 2015-10-16 |
| * | | | | | | | | | | | | strbuf: make stripspace() part of strbuf | Tobias Klauser | 2015-10-16 |
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||
* | | | | | | | | | | | | Merge branch 'jk/repository-extension' into maint | Junio C Hamano | 2015-11-03 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | |||
| * | | | | | | | | | | | introduce "preciousObjects" repository extension | Jeff King | 2015-06-24 |
* | | | | | | | | | | | | Merge branch 'nd/ls-remote-does-not-have-u-option' into maint | Junio C Hamano | 2015-10-16 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | ls-remote.txt: delete unsupported option | Nguyễn Thái Ngọc Duy | 2015-09-28 |
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||
* | | | | | | | | | | | | Merge branch 'jc/fsck-dropped-errors' into maint | Junio C Hamano | 2015-10-16 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | fsck: exit with non-zero when problems are found | Junio C Hamano | 2015-09-23 |
* | | | | | | | | | | | | | Merge branch 'pt/am-builtin' into maint | Junio C Hamano | 2015-10-16 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | am: configure gpg at startup | Renee Margaret McConahy | 2015-09-30 |
* | | | | | | | | | | | | | | Merge branch 'jk/blame-first-parent' into maint | Junio C Hamano | 2015-10-16 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | blame: handle --first-parent | Jeff King | 2015-09-16 |
* | | | | | | | | | | | | | | | Merge branch 'pt/pull-builtin' into maint | Junio C Hamano | 2015-10-16 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | pull: enclose <options> in brackets in the usage string | Alex Henrie | 2015-10-16 |
* | | | | | | | | | | | | | | | Sync with v2.5.4 | Junio C Hamano | 2015-09-28 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | Sync with 2.4.10 | Junio C Hamano | 2015-09-28 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | |||
| | * | | | | | | | | | | | | Sync with 2.3.10 | Junio C Hamano | 2015-09-28 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | |||
| | | * | | | | | | | | | | | merge-file: enforce MAX_XDIFF_SIZE on incoming files | Jeff King | 2015-09-28 |