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
/
merge-recursive.c
Age
Commit message (
Expand
)
Author
2007-06-13
-Wold-style-definition fix
Junio C Hamano
2007-06-05
merge-recursive: refuse to merge binary files
Johannes Schindelin
2007-04-27
Ignore merged status of the file-level merge
Alex Riesen
2007-04-26
Add a test for merging changed and rename-changed branches
Alex Riesen
2007-04-26
Avoid excessive rewrites in merge-recursive
Alex Riesen
2007-04-22
Merge branch 'jc/attr'
Junio C Hamano
2007-04-21
Fix bogus linked-list management for user defined merge drivers.
Junio C Hamano
2007-04-20
Kill the useless progress meter in merge-recursive
Shawn O. Pearce
2007-04-20
Fix working directory errno handling when unlinking a directory
Linus Torvalds
2007-04-19
Simplify code to find recursive merge driver.
Junio C Hamano
2007-04-19
Counto-fix in merge-recursive
Junio C Hamano
2007-04-19
Fix funny types used in attribute value representation
Junio C Hamano
2007-04-18
Allow low-level driver to specify different behaviour during internal merge.
Junio C Hamano
2007-04-18
Custom low-level merge driver: change the configuration scheme.
Junio C Hamano
2007-04-18
Allow the default low-level merge driver to be configured.
Junio C Hamano
2007-04-18
Custom low-level merge driver support.
Junio C Hamano
2007-04-18
Allow specifying specialized merge-backend per path.
Junio C Hamano
2007-04-17
merge-recursive: separate out xdl_merge() interface.
Junio C Hamano
2007-04-10
merge-recursive: handle D/F conflict case more carefully.
Junio C Hamano
2007-04-10
merge-recursive: do not barf on "to be removed" entries.
Junio C Hamano
2007-04-07
A new merge stragety 'subtree'.
Junio C Hamano
2007-04-07
Merge branch 'jc/index-output'
Junio C Hamano
2007-04-06
Fix bogus error message from merge-recursive error path
Junio C Hamano
2007-04-04
_GIT_INDEX_OUTPUT: allow plumbing to output to an alternative index file.
Junio C Hamano
2007-04-01
Keep rename/rename conflicts of intermediate merges while doing recursive merge
Alex Riesen
2007-03-04
Handle core.symlinks=false case in merge-recursive.
Johannes Sixt
2007-02-27
convert object type handling from a string to a number
Nicolas Pitre
2007-02-26
merge-recursive: fix longstanding bug in merging symlinks
Junio C Hamano
2007-02-06
Use pretend_sha1_file() in git-blame and git-merge-recursive.
Junio C Hamano
2007-02-04
Keep untracked files not involved in a merge.
Shawn O. Pearce
2007-02-04
Assorted typo fixes
Pavel Roskin
2007-01-14
Convert output messages in merge-recursive to past tense.
Shawn O. Pearce
2007-01-14
Display a progress meter during merge-recursive.
Shawn O. Pearce
2007-01-14
Enable output buffering in merge-recursive.
Shawn O. Pearce
2007-01-14
Allow the user to control the verbosity of merge-recursive.
Shawn O. Pearce
2007-01-14
Remove unnecessary call_depth parameter in merge-recursive.
Shawn O. Pearce
2007-01-12
merge-recursive: do not report the resulting tree object name
Junio C Hamano
2007-01-11
merge-recursive: do not use on-file index when not needed.
Junio C Hamano
2007-01-11
Speed-up recursive by flushing index only once for all entries
Alex Riesen
2007-01-09
short i/o: fix calls to write to use xwrite or write_in_full
Andy Whitcroft
2006-12-29
Allow merging bare trees in merge-recursive.
Shawn O. Pearce
2006-12-29
Move better_branch_name above get_ref in merge-recursive.
Shawn O. Pearce
2006-12-23
Display 'theirs' branch name when possible in merge.
Shawn O. Pearce
2006-12-23
Use extended SHA1 syntax in merge-recursive conflicts.
Shawn O. Pearce
2006-12-21
Merge branch 'jc/clone'
Junio C Hamano
2006-12-20
simplify inclusion of system header files.
Junio C Hamano
2006-12-19
Use preprocessor constants for environment variable names.
Junio C Hamano
2006-12-13
Merge branch 'js/merge'
Junio C Hamano
2006-12-13
Remove uncontested renamed files during merge.
Shawn Pearce
2006-12-13
merge-recursive: add/add really is modify/modify with an empty base
Johannes Schindelin
[next]