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
/
t7601-merge-pull-config.sh
Age
Commit message (
Expand
)
Author
2021-11-19
pull: should be noop when already-up-to-date
Erwin Villejo
2021-10-29
pull: --ff-only should make it a noop when already-up-to-date
Junio C Hamano
2021-07-22
pull: fix handling of multiple heads
Elijah Newren
2021-07-22
pull: abort by default when fast-forwarding is not possible
Elijah Newren
2021-07-22
pull: make --rebase and --no-rebase override pull.ff=only
Elijah Newren
2021-07-21
pull: abort if --ff-only is given and fast-forwarding is impossible
Alex Henrie
2021-07-21
t7601: add tests of interactions with multiple merge heads and config
Elijah Newren
2021-07-21
t7601: test interaction of merge/rebase/fast-forward flags and options
Elijah Newren
2020-12-16
pull: display default warning only when non-ff
Felipe Contreras
2020-11-20
pull: colorize the hint about setting `pull.rebase`
Johannes Schindelin
2020-09-25
pull: don't warn if pull.ff has been set
Alex Henrie
2020-03-10
pull: warn if the user didn't say whether to rebase or to merge
Alex Henrie
2015-05-18
pull: make pull.ff=true override merge.ff
Paul Tan
2014-01-16
pull: add pull.ff configuration
David Aguilar
2013-07-29
many small typofixes
Ondřej Bílka
2013-04-13
Correct common spelling mistakes in comments and tests
Stefano Lattarini
2010-10-07
t7601 (merge-pull-config): add missing &&
Elijah Newren
2008-09-04
tests: use "git xyzzy" form (t7200 - t9001)
Nanako Shiraishi
2008-07-23
t7601: extend the 'merge picks up the best result' test
Miklos Vajna
2008-07-22
builtin-merge: give a proper error message for invalid strategies in config
Miklos Vajna
2008-07-07
Fix t7601-merge-pull-config.sh on AIX
Miklos Vajna
2008-07-01
Add new test to ensure git-merge handles pull.twohead and pull.octopus
Miklos Vajna