summaryrefslogtreecommitdiff
path: root/contrib/hooks/multimail/git_multimail.py
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-08-12 14:09:56 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-08-12 14:09:56 -0700
commit53860f03927fea9c46d64b556a06fffe4b46e41f (patch)
tree356d50e67d39bc96390d50a81c3976fb831c012f /contrib/hooks/multimail/git_multimail.py
parentMerge branch 'pt/am-builtin' (diff)
parentDocumentation/git-worktree: fix duplicated 'from' (diff)
downloadtgif-53860f03927fea9c46d64b556a06fffe4b46e41f.tar.xz
Merge branch 'es/worktree-add-cleanup'
The "new-worktree-mode" hack in "checkout" that was added in nd/multiple-work-trees topic has been removed by updating the implementation of new "worktree add". * es/worktree-add-cleanup: (25 commits) Documentation/git-worktree: fix duplicated 'from' Documentation/config: mention "now" and "never" for 'expire' settings Documentation/git-worktree: fix broken 'linkgit' invocation checkout: drop intimate knowledge of newly created worktree worktree: populate via "git reset --hard" rather than "git checkout" worktree: avoid resolving HEAD unnecessarily worktree: make setup of new HEAD distinct from worktree population worktree: detect branch-name/detached and error conditions locally worktree: add_worktree: construct worktree-population command locally worktree: elucidate environment variables intended for child processes worktree: make branch creation distinct from worktree population worktree: add: suppress auto-vivication with --detach and no <branch> worktree: make --detach mutually exclusive with -b/-B worktree: introduce options container worktree: simplify new branch (-b/-B) option checking worktree: improve worktree setup message branch: publish die_if_checked_out() checkout: teach check_linked_checkout() about symbolic link HEAD checkout: check_linked_checkout: simplify symref parsing checkout: check_linked_checkout: improve "already checked out" aesthetic ...
Diffstat (limited to 'contrib/hooks/multimail/git_multimail.py')
0 files changed, 0 insertions, 0 deletions