mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
e90cc075cc43f2bf08a8963ae84d3e4da50ebfc3
git/builtin
History
Josh Triplett e90cc075cc commit: unify logic to avoid multiple scissors lines when merging 
prepare_to_commit has some logic to figure out whether merge already
added a scissors line, and therefore it shouldn't add another. Now that
wt_status_add_cut_line has built-in state for whether it has
already added a previous line, just set that state instead, and then
remove that condition from subsequent calls to wt_status_add_cut_line.

Signed-off-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2024-02-27 09:40:47 -08:00
..
add.c
treewide: remove unnecessary includes in source files
2023-12-26 12:04:31 -08:00
am.c
treewide: remove unnecessary includes in source files
2023-12-26 12:04:31 -08:00
annotate.c
…
apply.c
treewide: remove unnecessary includes in source files
2023-12-26 12:04:31 -08:00
archive.c
treewide: remove unnecessary includes in source files
2023-12-26 12:04:33 -08:00
bisect.c
Merge branch 'en/header-cleanup' into maint-2.43
2024-02-08 16:22:10 -08:00
blame.c
Merge branch 'en/header-cleanup' into maint-2.43
2024-02-08 16:22:10 -08:00
branch.c
treewide: remove unnecessary includes in source files
2023-12-26 12:04:31 -08:00
bugreport.c
bugreport: reject positional arguments
2023-10-29 08:56:17 +09:00
bundle.c
Merge branch 'rs/bundle-parseopt-cleanup'
2023-08-07 11:57:18 -07:00
cat-file.c
treewide: remove unnecessary includes in source files
2023-12-26 12:04:31 -08:00
check-attr.c
check-attr: integrate with sparse-index
2023-08-11 09:44:52 -07:00
check-ignore.c
cache.h: remove this no-longer-used header
2023-06-21 13:39:53 -07:00
check-mailmap.c
builtin.h: remove unneccessary includes
2023-06-21 13:39:54 -07:00
check-ref-format.c
cache.h: remove this no-longer-used header
2023-06-21 13:39:53 -07:00
checkout--worker.c
git-compat-util: move alloc macros to git-compat-util.h
2023-07-05 11:42:31 -07:00
checkout-index.c
treewide: remove unnecessary includes in source files
2023-12-26 12:04:31 -08:00
checkout.c
Merge branch 'en/header-cleanup' into maint-2.43
2024-02-08 16:22:10 -08:00
clean.c
clean: factorize incompatibility message
2023-12-09 07:41:03 +09:00
clone.c
Merge branch 'en/header-cleanup' into maint-2.43
2024-02-08 16:22:10 -08:00
column.c
Merge branch 'rs/column-leakfix' into maint-2.43
2024-02-08 16:22:06 -08:00
commit-graph.c
treewide: remove unnecessary includes in source files
2023-12-26 12:04:33 -08:00
commit-tree.c
treewide: remove unnecessary includes in source files
2023-12-26 12:04:31 -08:00
commit.c
commit: unify logic to avoid multiple scissors lines when merging
2024-02-27 09:40:47 -08:00
config.c
Merge branch 'cw/compat-util-header-cleanup'
2023-07-17 11:30:42 -07:00
count-objects.c
count-objects: mark unused parameter in alternates callback
2023-07-13 17:24:00 -07:00
credential-cache--daemon.c
git-compat-util: move alloc macros to git-compat-util.h
2023-07-05 11:42:31 -07:00
credential-cache.c
treewide: remove unnecessary includes in source files
2023-12-26 12:04:31 -08:00
credential-store.c
Merge branch 'cw/strbuf-cleanup'
2023-07-06 11:54:46 -07:00
credential.c
builtins: mark unused prefix parameters
2023-03-28 14:11:24 -07:00
describe.c
treewide: remove unnecessary includes in source files
2023-12-26 12:04:31 -08:00
diagnose.c
object-file.h: move declarations for object-file.c functions from cache.h
2023-04-11 08:52:10 -07:00
diff-files.c
treewide: remove unnecessary includes in source files
2023-12-26 12:04:31 -08:00
diff-index.c
treewide: remove unnecessary includes in source files
2023-12-26 12:04:31 -08:00
diff-tree.c
treewide: remove unnecessary includes in source files
2023-12-26 12:04:31 -08:00
diff.c
treewide: remove unnecessary includes in source files
2023-12-26 12:04:31 -08:00
difftool.c
treewide: remove unnecessary includes in source files
2023-12-26 12:04:31 -08:00
fast-export.c
treewide: remove unnecessary includes in source files
2023-12-26 12:04:31 -08:00
fast-import.c
fast-import: use mem_pool_calloc()
2023-12-26 11:06:23 -08:00
fetch-pack.c
git-compat-util: move alloc macros to git-compat-util.h
2023-07-05 11:42:31 -07:00
fetch.c
Merge branch 'en/header-cleanup' into maint-2.43
2024-02-08 16:22:10 -08:00
fmt-merge-msg.c
treewide: remove unnecessary includes for wrapper.h
2023-07-05 11:41:59 -07:00
for-each-ref.c
treewide: add direct includes currently only pulled in transitively
2023-12-26 12:04:32 -08:00
for-each-repo.c
cache.h: remove this no-longer-used header
2023-06-21 13:39:53 -07:00
fsck.c
treewide: remove unnecessary includes in source files
2023-12-26 12:04:33 -08:00
fsmonitor--daemon.c
treewide: remove unnecessary includes in source files
2023-12-26 12:04:33 -08:00
gc.c
Merge branch 'tb/repack-max-cruft-size'
2023-10-18 13:25:41 -07:00
get-tar-commit-id.c
treewide: remove unnecessary includes in source files
2023-12-26 12:04:31 -08:00
grep.c
treewide: remove unnecessary includes in source files
2023-12-26 12:04:33 -08:00
hash-object.c
treewide: remove unnecessary includes in source files
2023-12-26 12:04:31 -08:00
help.c
Merge branch 'gc/config-context'
2023-07-06 11:54:48 -07:00
hook.c
treewide: remove unnecessary includes in source files
2023-12-26 12:04:31 -08:00
index-pack.c
Merge branch 'jk/index-pack-lsan-false-positive-fix' into maint-2.43
2024-02-08 16:22:12 -08:00
init-db.c
treewide: remove unnecessary includes in source files
2023-12-26 12:04:31 -08:00
interpret-trailers.c
Merge branch 'la/trailer-test-and-doc-updates'
2023-10-13 14:18:27 -07:00
log.c
Merge branch 'en/header-cleanup' into maint-2.43
2024-02-08 16:22:10 -08:00
ls-files.c
treewide: remove unnecessary includes in source files
2023-12-26 12:04:31 -08:00
ls-remote.c
treewide: remove unnecessary includes in source files
2023-12-26 12:04:31 -08:00
ls-tree.c
treewide: remove unnecessary includes in source files
2023-12-26 12:04:31 -08:00
mailinfo.c
treewide: remove unnecessary includes in source files
2023-12-26 12:04:31 -08:00
mailsplit.c
cache.h: remove this no-longer-used header
2023-06-21 13:39:53 -07:00
merge-base.c
treewide: remove unnecessary includes in source files
2023-12-26 12:04:31 -08:00
merge-file.c
merge-file: add an option to process object IDs
2023-11-02 08:51:40 +09:00
merge-index.c
read-cache*.h: move declarations for read-cache.c functions from cache.h
2023-06-21 13:39:53 -07:00
merge-ours.c
diff.h: remove unnecessary include of oidset.h
2023-06-21 13:39:53 -07:00
merge-recursive.c
treewide: remove unnecessary includes in source files
2023-12-26 12:04:31 -08:00
merge-tree.c
Merge branch 'en/header-cleanup' into maint-2.43
2024-02-08 16:22:10 -08:00
merge.c
Merge branch 'en/header-cleanup' into maint-2.43
2024-02-08 16:22:10 -08:00
mktag.c
treewide: remove unnecessary includes in source files
2023-12-26 12:04:33 -08:00
mktree.c
git-compat-util: move alloc macros to git-compat-util.h
2023-07-05 11:42:31 -07:00
multi-pack-index.c
Merge branch 'gc/config-context'
2023-07-06 11:54:48 -07:00
mv.c
treewide: remove unnecessary includes in source files
2023-12-26 12:04:31 -08:00
name-rev.c
name-rev: use OPT_HIDDEN_BOOL for --peel-tag
2023-09-05 14:58:44 -07:00
notes.c
treewide: remove unnecessary includes in source files
2023-12-26 12:04:31 -08:00
pack-objects.c
Merge branch 'en/header-cleanup' into maint-2.43
2024-02-08 16:22:10 -08:00
pack-redundant.c
object-store-ll.h: split this header out of object-store.h
2023-06-21 13:39:54 -07:00
pack-refs.c
pack-refs: teach pack-refs --include option
2023-05-12 14:54:14 -07:00
patch-id.c
Merge branch 'gc/config-context'
2023-07-06 11:54:48 -07:00
prune-packed.c
treewide: be explicit about dependence on gettext.h
2023-03-21 10:56:51 -07:00
prune.c
Merge branch 'en/header-split-cache-h-part-3'
2023-06-29 16:43:21 -07:00
pull.c
treewide: remove unnecessary includes in source files
2023-12-26 12:04:31 -08:00
push.c
Merge branch 'en/header-cleanup' into maint-2.43
2024-02-08 16:22:10 -08:00
range-diff.c
treewide: remove unnecessary includes in source files
2023-12-26 12:04:31 -08:00
read-tree.c
treewide: remove unnecessary includes in source files
2023-12-26 12:04:31 -08:00
rebase.c
Merge branch 'en/header-cleanup' into maint-2.43
2024-02-08 16:22:10 -08:00
receive-pack.c
Merge branch 'en/header-cleanup' into maint-2.43
2024-02-08 16:22:10 -08:00
reflog.c
Merge branch 'jb/reflog-expire-delete-dry-run-options' into maint-2.43
2024-02-08 16:22:05 -08:00
remote-ext.c
builtins: annotate always-empty prefix parameters
2023-03-28 14:11:24 -07:00
remote-fd.c
builtins: annotate always-empty prefix parameters
2023-03-28 14:11:24 -07:00
remote.c
Merge branch 'jc/parse-options-short-help'
2023-08-04 10:52:31 -07:00
repack.c
Merge branch 'en/header-cleanup' into maint-2.43
2024-02-08 16:22:10 -08:00
replace.c
replace: mark unused parameter in each_mergetag_fn callback
2023-07-13 17:24:00 -07:00
rerere.c
treewide: remove unnecessary includes in source files
2023-12-26 12:04:31 -08:00
reset.c
treewide: remove unnecessary includes in source files
2023-12-26 12:04:31 -08:00
rev-list.c
treewide: remove unnecessary includes in source files
2023-12-26 12:04:33 -08:00
rev-parse.c
revision, rev-parse: factorize incompatibility messages about - -exclude-hidden
2023-12-09 07:41:03 +09:00
revert.c
treewide: remove unnecessary includes in source files
2023-12-26 12:04:31 -08:00
rm.c
treewide: remove unnecessary includes in source files
2023-12-26 12:04:31 -08:00
send-pack.c
Merge branch 'en/header-cleanup' into maint-2.43
2024-02-08 16:22:10 -08:00
shortlog.c
diff.h: remove unnecessary include of oidset.h
2023-06-21 13:39:53 -07:00
show-branch.c
Merge branch 'jc/parse-options-show-branch'
2023-07-27 15:26:37 -07:00
show-index.c
cache.h: remove this no-longer-used header
2023-06-21 13:39:53 -07:00
show-ref.c
Merge branch 'tc/show-ref-exists-fix' into maint-2.43
2024-02-13 14:44:47 -08:00
sparse-checkout.c
Merge branch 'en/header-cleanup' into maint-2.43
2024-02-08 16:22:10 -08:00
stash.c
Merge branch 'ps/report-failure-from-git-stash' into maint-2.43
2024-02-13 14:44:49 -08:00
stripspace.c
Merge branch 'cw/strbuf-cleanup'
2023-07-06 11:54:46 -07:00
submodule--helper.c
treewide: remove unnecessary includes in source files
2023-12-26 12:04:31 -08:00
symbolic-ref.c
git-compat-util: move strbuf.c funcs to its header
2023-07-05 11:41:18 -07:00
tag.c
Merge branch 'jc/sign-buffer-failure-propagation-fix' into maint-2.43
2024-02-13 14:44:48 -08:00
unpack-file.c
treewide: remove unnecessary includes for wrapper.h
2023-07-05 11:41:59 -07:00
unpack-objects.c
treewide: remove unnecessary includes in source files
2023-12-26 12:04:31 -08:00
update-index.c
Merge branch 'jc/unresolve-removal'
2023-10-02 11:20:00 -07:00
update-ref.c
treewide: remove unnecessary includes in source files
2023-12-26 12:04:31 -08:00
update-server-info.c
cache.h: remove this no-longer-used header
2023-06-21 13:39:53 -07:00
upload-archive.c
repository: remove unnecessary include of path.h
2023-06-21 13:39:53 -07:00
upload-pack.c
Merge branch 'en/header-split-cache-h-part-3'
2023-06-29 16:43:21 -07:00
var.c
Merge branch 'bc/more-git-var'
2023-09-13 10:07:57 -07:00
verify-commit.c
treewide: remove unnecessary includes in source files
2023-12-26 12:04:31 -08:00
verify-pack.c
builtin.h: remove unneccessary includes
2023-06-21 13:39:54 -07:00
verify-tag.c
treewide: remove unnecessary includes in source files
2023-12-26 12:04:31 -08:00
worktree.c
Merge branch 'jc/comment-style-fixes' into maint-2.43
2024-02-13 14:44:48 -08:00
write-tree.c
cache.h: remove this no-longer-used header
2023-06-21 13:39:53 -07:00