Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | rev-list: make it obvious that we do not support notesjk/rev-list-has-no-notes | Jeff King | 2015-08-24 | 1 | -0/+3 |
* | Merge branch 'sb/remove-unused-var-from-builtin-add' into maint | Junio C Hamano | 2015-08-19 | 1 | -2/+0 |
|\ | |||||
| * | add: remove dead codesb/remove-unused-var-from-builtin-add | Stefan Beller | 2015-07-31 | 1 | -2/+0 |
* | | Merge branch 'ib/scripted-parse-opt-better-hint-string' into maint | Junio C Hamano | 2015-08-19 | 1 | -27/+30 |
|\ \ | |||||
| * | | rev-parse --parseopt: allow [*=?!] in argument hintsib/scripted-parse-opt-better-hint-string | Ilya Bobyr | 2015-07-15 | 1 | -27/+30 |
* | | | Merge branch 'db/send-pack-user-signingkey' into maint | Junio C Hamano | 2015-08-19 | 1 | -0/+3 |
|\ \ \ | |||||
| * | | | builtin/send-pack.c: respect user.signingkeydb/send-pack-user-signingkey | Junio C Hamano | 2015-07-21 | 1 | -0/+3 |
| * | | | Merge branch 'mh/fsck-reflog-entries' into maint | Junio C Hamano | 2015-07-15 | 1 | -14/+20 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks' into maint | Junio C Hamano | 2015-07-15 | 1 | -6/+6 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge branch 'jx/do-not-crash-receive-pack-wo-head' into maint | Junio C Hamano | 2015-08-19 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | receive-pack: crash when checking with non-exist HEADjx/do-not-crash-receive-pack-wo-head | Jiang Xin | 2015-07-22 | 1 | -1/+1 |
* | | | | | | | Merge branch 'es/worktree-add' | Junio C Hamano | 2015-07-13 | 2 | -153/+199 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Revert "checkout: retire --ignore-other-worktrees in favor of --force" | Junio C Hamano | 2015-07-12 | 2 | -4/+6 |
| * | | | | | | | checkout: retire --ignore-other-worktrees in favor of --force | Eric Sunshine | 2015-07-07 | 2 | -6/+4 |
| * | | | | | | | worktree: add: auto-vivify new branch when <branch> is omitted | Eric Sunshine | 2015-07-07 | 1 | -2/+6 |
| * | | | | | | | worktree: add: make -b/-B default to HEAD when <branch> is omitted | Eric Sunshine | 2015-07-06 | 1 | -2/+4 |
| * | | | | | | | worktree: extract basename computation to new function | Eric Sunshine | 2015-07-06 | 1 | -9/+20 |
| * | | | | | | | checkout: require worktree unconditionally | Eric Sunshine | 2015-07-06 | 1 | -2/+0 |
| * | | | | | | | checkout: retire --to option | Eric Sunshine | 2015-07-06 | 2 | -166/+139 |
| * | | | | | | | worktree: add -b/-B options | Eric Sunshine | 2015-07-06 | 1 | -0/+11 |
| * | | | | | | | worktree: add --detach option | Eric Sunshine | 2015-07-06 | 1 | -1/+4 |
| * | | | | | | | worktree: add --force option | Eric Sunshine | 2015-07-06 | 1 | -1/+5 |
| * | | | | | | | worktree: introduce "add" command | Eric Sunshine | 2015-07-06 | 1 | -0/+31 |
| * | | | | | | | checkout: drop 'checkout_opts' dependency from prepare_linked_checkout | Eric Sunshine | 2015-07-06 | 1 | -4/+5 |
| * | | | | | | | checkout: make --to unconditionally verbose | Eric Sunshine | 2015-07-06 | 1 | -2/+1 |
| * | | | | | | | checkout: prepare_linked_checkout: drop now-unused 'new' argument | Eric Sunshine | 2015-07-06 | 1 | -3/+2 |
| * | | | | | | | checkout: relocate --to's "no branch specified" check | Eric Sunshine | 2015-07-06 | 1 | -3/+4 |
| * | | | | | | | checkout: fix bug with --to and relative HEAD | Eric Sunshine | 2015-07-06 | 1 | -4/+12 |
* | | | | | | | | Merge branch 'nd/multiple-work-trees' | Junio C Hamano | 2015-07-13 | 4 | -112/+145 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | worktree: new place for "git prune --worktrees"nd/multiple-work-trees | Nguyễn Thái Ngọc Duy | 2015-06-29 | 3 | -100/+134 |
| * | | | | | | | checkout: don't check worktrees when not necessary | Nguyễn Thái Ngọc Duy | 2015-06-12 | 1 | -12/+11 |
* | | | | | | | | Merge branch 'ss/clone-guess-dir-name-simplify' | Junio C Hamano | 2015-07-13 | 1 | -13/+6 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | clone: simplify string handling in guess_dir_name()ss/clone-guess-dir-name-simplify | Sebastian Schuberth | 2015-07-09 | 1 | -13/+6 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'ls/hint-rev-list-count' | Junio C Hamano | 2015-07-10 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | rev-list: add --count to usage guidels/hint-rev-list-count | Lawrence Siebert | 2015-07-01 | 1 | -0/+1 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge branch 'jk/clone-dissociate' into maint | Junio C Hamano | 2015-06-16 | 1 | -13/+4 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'ah/usage-strings' into maint | Junio C Hamano | 2015-06-16 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'rs/janitorial' into maint | Junio C Hamano | 2015-06-16 | 3 | -16/+4 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'dt/clean-pathspec-filter-then-lstat' into maint | Junio C Hamano | 2015-06-16 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'dl/branch-error-message' into maint | Junio C Hamano | 2015-06-05 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ps/bundle-verify-arg' into maint | Junio C Hamano | 2015-06-05 | 1 | -0/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/add-e-kill-editor' into maint | Junio C Hamano | 2015-06-05 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mh/clone-verbosity-fix' into maint | Junio C Hamano | 2015-06-05 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/sha1-file-reduce-useless-warnings' into maint | Junio C Hamano | 2015-06-05 | 1 | -3/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tb/blame-resurrect-convert-to-git' into maint | Junio C Hamano | 2015-06-05 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/plug-fmt-merge-msg-leak' into maint | Junio C Hamano | 2015-06-05 | 1 | -5/+11 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'pt/xdg-config-path' into maint | Junio C Hamano | 2015-06-05 | 2 | -9/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/hash-object' into maint | Junio C Hamano | 2015-05-26 | 1 | -3/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/rev-list-no-bitmap-while-pruning' | Junio C Hamano | 2015-07-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | rev-list: disable --use-bitmap-index when pruning commitsjk/rev-list-no-bitmap-while-pruning | Jeff King | 2015-07-01 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | |