Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'maint-2.4' into maint-2.5 | Junio C Hamano | 2016-03-17 |
|\ | |||
| * | list-objects: pass full pathname to callbacks | Jeff King | 2016-03-16 |
| * | list-objects: drop name_path entirely | Jeff King | 2016-03-16 |
* | | 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 |
| | * | react to errors in xdi_diff | Jeff King | 2015-09-28 |
* | | | Sync with 2.4.9 | Junio C Hamano | 2015-09-04 |
|\ \ \ | |/ / | |||
| * | | Sync with 2.3.9 | Junio C Hamano | 2015-09-04 |
| |\ \ | | |/ | |||
| | * | Sync with 2.2.3 | Junio C Hamano | 2015-09-04 |
| | |\ | |||
| | | * | show-branch: use a strbuf for reflog descriptions | Jeff King | 2015-09-04 |
* | | | | Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-tree-upd... | Junio C Hamano | 2015-09-03 |
|\ \ \ \ | |||
| * | | | | commit: don't rewrite shared index unnecessarily | David Turner | 2015-08-31 |
* | | | | | Merge branch 'jc/calloc-pathspec' into maint | Junio C Hamano | 2015-09-03 |
|\ \ \ \ \ | |||
| * | | | | | ps_matched: xcalloc() takes nmemb and then element size | Junio C Hamano | 2015-08-20 |
| | |/ / / | |/| | | | |||
| * | | | | Merge branch 'ss/clone-guess-dir-name-simplify' into maint | Junio C Hamano | 2015-08-03 |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge branch 'mh/reporting-broken-refs-from-for-each-ref' into maint | Junio C Hamano | 2015-08-03 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge branch 'ls/hint-rev-list-count' into maint | Junio C Hamano | 2015-07-27 |
| |\ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge branch 'jk/rev-list-no-bitmap-while-pruning' into maint | Junio C Hamano | 2015-07-27 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge branch 'jk/index-pack-reduce-recheck' into maint | Junio C Hamano | 2015-07-27 |
| |\ \ \ \ \ \ \ \ | |||
* | \ \ \ \ \ \ \ \ | Merge branch 'jk/rev-list-has-no-notes' into maint | Junio C Hamano | 2015-09-03 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | rev-list: make it obvious that we do not support notes | Jeff King | 2015-08-24 |
* | | | | | | | | | | | Merge branch 'mh/get-remote-group-fix' into maint | Junio C Hamano | 2015-09-03 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |||
| * | | | | | | | | | | get_remote_group(): use skip_prefix() | Michael Haggerty | 2015-07-28 |
| * | | | | | | | | | | get_remote_group(): eliminate superfluous call to strcspn() | Michael Haggerty | 2015-07-28 |
| * | | | | | | | | | | get_remote_group(): rename local variable "space" to "wordlen" | Michael Haggerty | 2015-07-28 |
| * | | | | | | | | | | get_remote_group(): handle remotes with single-character names | Michael Haggerty | 2015-07-28 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||
* | | | | | | | | | | Merge branch 'jk/guess-repo-name-regression-fix' into maint | Junio C Hamano | 2015-08-25 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||
| * | | | | | | | | | clone: use computed length in guess_dir_name | Jeff King | 2015-08-10 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||
* | | | | | | | | | Merge branch 'sb/remove-unused-var-from-builtin-add' into maint | Junio C Hamano | 2015-08-19 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | add: remove dead code | Stefan Beller | 2015-07-31 |
* | | | | | | | | | | Merge branch 'ib/scripted-parse-opt-better-hint-string' into maint | Junio C Hamano | 2015-08-19 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | rev-parse --parseopt: allow [*=?!] in argument hints | Ilya Bobyr | 2015-07-15 |
* | | | | | | | | | | | Merge branch 'db/send-pack-user-signingkey' into maint | Junio C Hamano | 2015-08-19 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | builtin/send-pack.c: respect user.signingkey | Junio C Hamano | 2015-07-21 |
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | |||
| * | | | | | | | | | | Merge branch 'mh/fsck-reflog-entries' into maint | Junio C Hamano | 2015-07-15 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks' into maint | Junio C Hamano | 2015-07-15 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
* | \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jx/do-not-crash-receive-pack-wo-head' into maint | Junio C Hamano | 2015-08-19 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | receive-pack: crash when checking with non-exist HEAD | Jiang Xin | 2015-07-22 |
* | | | | | | | | | | | | | | Merge branch 'es/worktree-add' | Junio C Hamano | 2015-07-13 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | Revert "checkout: retire --ignore-other-worktrees in favor of --force" | Junio C Hamano | 2015-07-12 |
| * | | | | | | | | | | | | | | checkout: retire --ignore-other-worktrees in favor of --force | Eric Sunshine | 2015-07-07 |
| * | | | | | | | | | | | | | | worktree: add: auto-vivify new branch when <branch> is omitted | Eric Sunshine | 2015-07-07 |
| * | | | | | | | | | | | | | | worktree: add: make -b/-B default to HEAD when <branch> is omitted | Eric Sunshine | 2015-07-06 |
| * | | | | | | | | | | | | | | worktree: extract basename computation to new function | Eric Sunshine | 2015-07-06 |
| * | | | | | | | | | | | | | | checkout: require worktree unconditionally | Eric Sunshine | 2015-07-06 |
| * | | | | | | | | | | | | | | checkout: retire --to option | Eric Sunshine | 2015-07-06 |
| * | | | | | | | | | | | | | | worktree: add -b/-B options | Eric Sunshine | 2015-07-06 |
| * | | | | | | | | | | | | | | worktree: add --detach option | Eric Sunshine | 2015-07-06 |
| * | | | | | | | | | | | | | | worktree: add --force option | Eric Sunshine | 2015-07-06 |