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
/
builtin
/
merge.c
Age
Commit message (
Expand
)
Author
2011-03-20
Merge branch 'jk/merge-rename-ux'
Junio C Hamano
2011-03-10
Merge branch 'js/cherry-pick-usability'
Junio C Hamano
2011-02-28
Merge branch 'mg/placeholders-are-lowercase'
Junio C Hamano
2011-02-28
Merge branch 'js/maint-merge-use-prepare-commit-msg-hook'
Junio C Hamano
2011-02-22
Introduce CHERRY_PICK_HEAD
Jay Soffian
2011-02-21
merge: enable progress reporting for rename detection
Jeff King
2011-02-16
merge: honor prepare-commit-msg hook
Jay Soffian
2011-02-15
Make <identifier> lowercase as per CodingGuidelines
Michael J Gruber
2011-02-15
Merge branch 'maint'
Junio C Hamano
2011-02-15
commit,merge,tag: describe -m likewise
Michael J Gruber
2010-12-28
cherry-pick/revert: add support for -X/--strategy-option
Jonathan Nieder
2010-12-13
Merge branch 'jn/git-cmd-h-bypass-setup'
Junio C Hamano
2010-12-08
Merge branch 'jh/notes-merge'
Junio C Hamano
2010-11-25
Merge branch 'cb/maint-orphan-merge-noclobber'
Junio C Hamano
2010-11-18
Provide 'git merge --abort' as a synonym to 'git reset --merge'
Johan Herland
2010-11-18
cmd_merge(): Parse options before checking MERGE_HEAD
Johan Herland
2010-11-15
do not overwrite untracked during merge from unborn branch
Clemens Buchacher
2010-11-03
Change incorrect "remote branch" to "remote tracking branch" in C code
Matthieu Moy
2010-10-27
Merge branch 'jf/merge-ignore-ws'
Junio C Hamano
2010-10-22
merge -h: show usage even with corrupt index
Nguyễn Thái Ngọc Duy
2010-09-30
Merge branch 'rr/fmt-merge-msg'
Junio C Hamano
2010-09-09
merge: Make 'merge.log' an integer or boolean option
Ramkumar Ramachandra
2010-09-09
merge: Make '--log' an integer option for number of shortlog entries
Ramkumar Ramachandra
2010-09-09
fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_len
Ramkumar Ramachandra
2010-09-04
Merge branch 'dg/local-mod-error-messages'
Junio C Hamano
2010-09-03
Merge branch 'jn/merge-custom-no-trivial'
Junio C Hamano
2010-09-03
Merge branch 'jn/update-contrib-example-merge'
Junio C Hamano
2010-09-03
Merge branch 'jn/merge-renormalize'
Junio C Hamano
2010-09-03
Move "show_all_errors = 1" to setup_unpack_trees_porcelain()
Matthieu Moy
2010-09-03
setup_unpack_trees_porcelain: take the whole options struct as parameter
Matthieu Moy
2010-09-03
Move set_porcelain_error_msgs to unpack-trees.c and rename it
Matthieu Moy
2010-08-26
merge-recursive: expose merge options for builtin merge
Jonathan Nieder
2010-08-22
Merge branch 'gb/split-cmdline-errmsg'
Junio C Hamano
2010-08-19
merge: do not mistake (ancestor of) tag for branch
Jonathan Nieder
2010-08-16
merge: let custom strategies intervene in trivial merges
Jonathan Nieder
2010-08-11
unpack_trees: group error messages by type
Matthieu Moy
2010-08-11
merge-recursive: porcelain messages for checkout
Diane Gasselin
2010-08-11
Turn unpack_trees_options.msgs into an array + enum
Matthieu Moy
2010-08-11
split_cmdline: Allow caller to access error string
Greg Brockman
2010-08-06
merge-recursive --renormalize
Jonathan Nieder
2010-07-03
Avoid conflicts when merging branches with mixed normalization
Eyvind Bernhardsen
2010-06-18
Merge branch 'tc/merge-m-log'
Junio C Hamano
2010-05-10
merge: --log appends shortlog to message if specified
Tay Ray Chuan
2010-05-10
merge: rename variable
Tay Ray Chuan
2010-05-10
merge: update comment
Tay Ray Chuan
2010-05-09
Merge branch 'cc/revert-strategy'
Junio C Hamano
2010-04-01
merge: make function try_merge_command non static
Christian Couder
2010-04-01
merge: refactor code that calls "git merge-STRATEGY"
Christian Couder
2010-03-29
Merge branch 'cc/cherry-pick-ff'
Junio C Hamano
2010-02-23
Move 'builtin-*' into a 'builtin/' subdirectory
Linus Torvalds