diff options
| author | Taylor Blau <me@ttaylorr.com> | 2022-10-30 21:04:43 -0400 |
|---|---|---|
| committer | Taylor Blau <me@ttaylorr.com> | 2022-10-30 21:04:43 -0400 |
| commit | a23e0b69e2d25a893e187d86719de0b12b324579 (patch) | |
| tree | d132e8bca5e8987ec64b992b1db080966ce590ae /builtin/commit.c | |
| parent | Merge branch 'pw/rebase-reflog-fixes' (diff) | |
| parent | subtree: fix split after annotated tag was squashed merged (diff) | |
| download | git-a23e0b69e2d25a893e187d86719de0b12b324579.tar.gz git-a23e0b69e2d25a893e187d86719de0b12b324579.zip | |
Merge branch 'pb/subtree-split-and-merge-after-squashing-tag-fix'
A bugfix to "git subtree" in its split and merge features.
* pb/subtree-split-and-merge-after-squashing-tag-fix:
subtree: fix split after annotated tag was squashed merged
subtree: fix squash merging after annotated tag was squashed merged
subtree: process 'git-subtree-split' trailer in separate function
subtree: use named variables instead of "$@" in cmd_pull
subtree: define a variable before its first use in 'find_latest_squash'
subtree: prefix die messages with 'fatal'
subtree: add 'die_incompatible_opt' function to reduce duplication
subtree: use 'git rev-parse --verify [--quiet]' for better error messages
test-lib-functions: mark 'test_commit' variables as 'local'
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions