Welcome to
mirror list
, hosted at
ThFree Co
, Russian Federation.
git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
index
:
git.kernel.org/pub/scm/git/git.git
main
maint
master
next
seen
todo
Unnamed repository; edit this file 'description' to name the repository.
root
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
t
/
t7600-merge.sh
Age
Commit message (
Expand
)
Author
2023-05-23
t7600-merge: modernize test format
John Cai
2022-12-05
t7600: don't ignore "rev-parse" exit code in helper
Ævar Arnfjörð Bjarmason
2022-08-24
merge: only apply autostash when appropriate
Elijah Newren
2021-12-13
t6000-t9999: detect and signal failure within loop
Eric Sunshine
2021-09-13
tests: remove leftover untracked files
Elijah Newren
2021-07-24
merge: apply autostash if merge strategy fails
Philippe Blain
2021-07-24
merge: apply autostash if fast-forward fails
Philippe Blain
2021-02-11
tests: remove most uses of test_i18ncmp
Ævar Arnfjörð Bjarmason
2020-11-20
t7[5-9]*: adjust the references to the default branch name "main"
Johannes Schindelin
2020-11-20
tests: mark tests relying on the current default for `init.defaultBranch`
Johannes Schindelin
2020-08-07
t: don't spuriously close and reopen quotes
Martin Ågren
2020-07-30
Revert "fmt-merge-msg: stop treating `master` specially"
Junio C Hamano
2020-06-24
fmt-merge-msg: stop treating `master` specially
Johannes Schindelin
2020-04-10
merge: teach --autostash option
Denton Liu
2020-03-25
t7600: use test_write_lines()
Denton Liu
2019-06-17
Merge branch 'vv/merge-squash-with-explicit-commit'
Junio C Hamano
2019-06-13
Merge branch 'jk/help-unknown-ref-fix'
Junio C Hamano
2019-06-13
Merge branch 'nd/merge-quit'
Junio C Hamano
2019-05-28
merge: refuse --commit with --squash
Vishal Verma
2019-05-19
merge: add --quit
Nguyễn Thái Ngọc Duy
2019-05-15
help_unknown_ref(): check for refname ambiguity
Jeff King
2019-05-15
help_unknown_ref(): duplicate collected refnames
Jeff King
2019-04-18
merge: add scissors line on merge conflict
Denton Liu
2019-04-18
t7600: clean up style
Denton Liu
2018-08-21
tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'
SZEDER Gábor
2018-02-16
merge: allow fast-forward when merging a tracked tag
Junio C Hamano
2017-10-07
tests: fix diff order arguments in test_cmp
Stefan Beller
2017-08-23
merge: save merge state earlier
Michael J Gruber
2016-12-14
merge: ensure '--abort' option takes no arguments
Chris Packham
2016-12-14
merge: add '--continue' option as a synonym for 'git commit'
Chris Packham
2016-04-06
Merge branch 'jv/merge-nothing-into-void'
Junio C Hamano
2016-04-06
Merge branch 'ss/commit-squash-msg'
Junio C Hamano
2016-03-23
merge: fix NULL pointer dereference when merging nothing into void
Junio C Hamano
2016-03-22
commit: do not lose SQUASH_MSG contents
Sven Strickroth
2015-10-30
Merge branch 'jk/merge-file-exit-code'
Junio C Hamano
2015-10-29
merge-file: clamp exit code to maximum 127
Jeff King
2015-03-20
t: fix trivial &&-chain breakage
Jeff King
2014-05-15
git-show: fix 'git show -s' to not add extra terminator after merge commit
Max Kirillov
2013-07-23
t7600: fix typo in test title
Junio C Hamano
2013-07-03
merge: handle --ff/--no-ff/--ff-only as a tri-state option
Miklos Vajna
2013-06-27
Merge branch 'vl/typofix'
Junio C Hamano
2013-06-19
random typofixes (committed missing a 't', successful missing an 's')
Veres Lajos
2013-03-25
t7600: use test_config to set/unset git config variables
Yann Droneaud
2012-08-27
Fix tests under GETTEXT_POISON on parseopt
Jiang Xin
2012-02-10
merge: do not launch an editor on "--no-edit $tag"
Junio C Hamano
2012-02-06
merge: do not create a signed tag merge under --ff-only option
Junio C Hamano
2011-11-08
merge: record tag objects without peeling in MERGE_HEAD
Junio C Hamano
2011-11-08
merge: notice local merging of tags and keep it unwrapped
Junio C Hamano
2011-10-13
Teach merge the '[-e|--edit]' option
Jay Soffian
2011-05-17
Merge branch 'mg/merge-ff-config'
Junio C Hamano
[next]