aboutsummaryrefslogtreecommitdiff
path: root/merge-recursive.c
Commit message (Expand)AuthorAge
* merge-recursive: refuse to merge binary filesJohannes Schindelin2007-06-15
* Ignore merged status of the file-level mergeAlex Riesen2007-04-26
* Add a test for merging changed and rename-changed branchesAlex Riesen2007-04-25
* Avoid excessive rewrites in merge-recursiveAlex Riesen2007-04-25
* Merge branch 'jc/attr'Junio C Hamano2007-04-21
|\
| * Fix bogus linked-list management for user defined merge drivers.Junio C Hamano2007-04-21
| * Simplify code to find recursive merge driver.Junio C Hamano2007-04-18
| * Counto-fix in merge-recursiveJunio C Hamano2007-04-18
| * Fix funny types used in attribute value representationJunio C Hamano2007-04-18
| * Allow low-level driver to specify different behaviour during internal merge.Junio C Hamano2007-04-18
| * Custom low-level merge driver: change the configuration scheme.Junio C Hamano2007-04-18
| * Allow the default low-level merge driver to be configured.Junio C Hamano2007-04-18
| * Custom low-level merge driver support.Junio C Hamano2007-04-18
| * Allow specifying specialized merge-backend per path.Junio C Hamano2007-04-17
| * merge-recursive: separate out xdl_merge() interface.Junio C Hamano2007-04-17
* | Kill the useless progress meter in merge-recursiveShawn O. Pearce2007-04-20
* | Fix working directory errno handling when unlinking a directoryLinus Torvalds2007-04-19
* | merge-recursive: handle D/F conflict case more carefully.Junio C Hamano2007-04-10
* | merge-recursive: do not barf on "to be removed" entries.Junio C Hamano2007-04-10
|/
* A new merge stragety 'subtree'.Junio C Hamano2007-04-07
* Merge branch 'jc/index-output'Junio C Hamano2007-04-07
|\
| * _GIT_INDEX_OUTPUT: allow plumbing to output to an alternative index file.Junio C Hamano2007-04-03
* | Fix bogus error message from merge-recursive error pathJunio C Hamano2007-04-05
|/
* Keep rename/rename conflicts of intermediate merges while doing recursive mergeAlex Riesen2007-03-31
* Handle core.symlinks=false case in merge-recursive.Johannes Sixt2007-03-03
* convert object type handling from a string to a numberNicolas Pitre2007-02-27
* merge-recursive: fix longstanding bug in merging symlinksJunio C Hamano2007-02-25
* Use pretend_sha1_file() in git-blame and git-merge-recursive.Junio C Hamano2007-02-05
* Keep untracked files not involved in a merge.Shawn O. Pearce2007-02-03
* Assorted typo fixesPavel Roskin2007-02-03
* Convert output messages in merge-recursive to past tense.Shawn O. Pearce2007-01-14
* Display a progress meter during merge-recursive.Shawn O. Pearce2007-01-14
* Enable output buffering in merge-recursive.Shawn O. Pearce2007-01-14
* Allow the user to control the verbosity of merge-recursive.Shawn O. Pearce2007-01-14
* Remove unnecessary call_depth parameter in merge-recursive.Shawn O. Pearce2007-01-14
* merge-recursive: do not report the resulting tree object nameJunio C Hamano2007-01-12
* merge-recursive: do not use on-file index when not needed.Junio C Hamano2007-01-10
* Speed-up recursive by flushing index only once for all entriesAlex Riesen2007-01-10
* short i/o: fix calls to write to use xwrite or write_in_fullAndy Whitcroft2007-01-08
* Allow merging bare trees in merge-recursive.Shawn O. Pearce2006-12-28
* Move better_branch_name above get_ref in merge-recursive.Shawn O. Pearce2006-12-28
* Display 'theirs' branch name when possible in merge.Shawn O. Pearce2006-12-23
* Use extended SHA1 syntax in merge-recursive conflicts.Shawn O. Pearce2006-12-23
* Merge branch 'jc/clone'Junio C Hamano2006-12-20
|\
| * Use preprocessor constants for environment variable names.Junio C Hamano2006-12-19
* | simplify inclusion of system header files.Junio C Hamano2006-12-20
|/
* Merge branch 'js/merge'Junio C Hamano2006-12-13
|\
| * merge-recursive: add/add really is modify/modify with an empty baseJohannes Schindelin2006-12-12
| * Merge branch 'master' into js/mergeJunio C Hamano2006-12-12
| |\
| * | merge-recursive: use xdl_merge().Junio C Hamano2006-12-02
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-15 23:57:29 +0000