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
/
Documentation
/
git-merge.txt
Age
Commit message (
Expand
)
Author
2023-01-13
git-merge.txt: mention 'ORIG_HEAD' in the Description
Philippe Blain
2022-09-14
Merge branch 'ab/dedup-config-and-command-docs'
Junio C Hamano
2022-09-07
docs: add and use include template for config/* includes
Ævar Arnfjörð Bjarmason
2022-08-03
doc: consolidate --rerere-autoupdate description
Junio C Hamano
2022-01-06
Merge branch 'jc/merge-detached-head-name'
Junio C Hamano
2021-12-21
merge: allow to pretend a merge is made into a different branch
Junio C Hamano
2021-12-02
update documentation for new zdiff3 conflictStyle
Elijah Newren
2021-07-22
pull: update docs & code for option compatibility with rebasing
Elijah Newren
2020-05-06
Doc: reference the "stash list" in autostash docs
Denton Liu
2020-04-10
merge: teach --autostash option
Denton Liu
2019-08-07
merge: do no-verify like commit
Michael J Gruber
2019-07-10
Merge branch 'nd/switch-and-restore'
Junio C Hamano
2019-07-10
Merge branch 'pw/doc-synopsis-markup-opmode-options'
Junio C Hamano
2019-06-18
show --continue/skip etc. consistently in synopsis
Phillip Wood
2019-06-13
Merge branch 'nd/merge-quit'
Junio C Hamano
2019-05-19
merge: add --quit
Nguyễn Thái Ngọc Duy
2019-04-02
doc: document --overwrite-ignore
Nguyễn Thái Ngọc Duy
2019-03-18
merge: tweak --rerere-autoupdate documentation
Phillip Wood
2018-10-29
config.txt: move merge-config.txt to config/
Nguyễn Thái Ngọc Duy
2018-08-03
Merge branch 'en/dirty-merge-fixes'
Junio C Hamano
2018-07-12
merge: allow reading the merge commit message from a file
Johannes Schindelin
2018-07-11
merge: fix misleading pre-merge check documentation
Elijah Newren
2018-06-18
Merge branch 'mw/doc-merge-enumfix'
Junio C Hamano
2018-06-14
doc: update the order of the syntax `git merge --continue`
Meng-Sung Wu
2017-11-06
Merge branch 'wk/pull-signoff'
Junio C Hamano
2017-10-19
Merge branch 'wk/merge-options-gpg-sign-doc'
Junio C Hamano
2017-10-13
pull: pass --signoff/--no-signoff to "git merge"
W. Trevor King
2017-10-12
Documentation/merge-options.txt: describe -S/--gpg-sign for 'pull'
W. Trevor King
2017-09-10
Merge branch 'ma/up-to-date'
Junio C Hamano
2017-08-27
Merge branch 'mg/killed-merge'
Junio C Hamano
2017-08-23
treewide: correct several "up-to-date" to "up to date"
Martin Ågren
2017-08-22
Documentation/git-merge: explain --continue
Michael J Gruber
2017-07-25
merge: add a --signoff flag
Łukasz Gryglicki
2017-03-31
Merge branch 'jc/merge-drop-old-syntax'
Junio C Hamano
2016-12-14
merge: add '--continue' option as a synonym for 'git commit'
Chris Packham
2016-04-21
pull: pass --allow-unrelated-histories to "git merge"
Junio C Hamano
2016-03-23
merge: refuse to create too cool a merge by default
Junio C Hamano
2015-10-05
Merge branch 'mm/keyid-docs'
Junio C Hamano
2015-09-21
Documentation: explain optional arguments better
Matthieu Moy
2015-09-21
Documentation: use 'keyid' consistently, not 'key-id'
Matthieu Moy
2015-09-17
Merge branch 'po/doc-branch-desc'
Junio C Hamano
2015-09-14
doc: show usage of branch description
Philip Oakley
2015-05-19
Merge branch 'jc/merge'
Junio C Hamano
2015-04-29
merge: drop 'git merge <message> HEAD <commit>' syntax
Junio C Hamano
2015-04-29
merge: handle FETCH_HEAD internally
Junio C Hamano
2015-03-14
*config.txt: stick to camelCase naming convention
Nguyễn Thái Ngọc Duy
2014-04-22
merge: enable defaulttoupstream by default
Felipe Contreras
2014-03-24
parse-options: multi-word argh should use dash to separate words
Junio C Hamano
2013-10-18
git-merge: document the -S option
Nicolas Vigier
2013-09-06
Merge branch 'maint-1.8.2' into maint-1.8.3
Junio C Hamano
[next]