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-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
2006-12-13
Merge branch 'master' into js/merge
Junio C Hamano
2006-12-12
Make sure the empty tree exists when needed in merge-recursive.
Shawn O. Pearce
2006-12-03
merge-recursive: use xdl_merge().
Junio C Hamano
2006-11-08
Merge branch 'jc/read-tree'
Junio C Hamano
2006-11-06
merge-recursive implicitely depends on trust_executable_bit
Alex Riesen
2006-10-28
merge-recursive: adjust to loosened "working file clobbered" check
Junio C Hamano
2006-10-28
merge-recursive: make a few functions static.
Junio C Hamano
2006-10-28
merge-recursive: use abbreviated commit object name.
Junio C Hamano
2006-10-14
Add hash_sha1_file()
Rene Scharfe
2006-09-02
Replace uses of strdup with xstrdup.
Shawn Pearce
2006-09-01
Use xmalloc instead of malloc
Jonas Fonseca
2006-08-24
hashcpy/hashcmp remaining bits.
Junio C Hamano
2006-08-24
Convert memcpy(a,b,20) to hashcpy(a,b).
Shawn Pearce
2006-08-13
Merge branch 'master' into js/c-merge-recursive
Junio C Hamano
2006-08-10
merge-recur: do not die unnecessarily
Johannes Schindelin
2006-08-10
merge-recur: try to merge older merge bases first
Johannes Schindelin
2006-08-10
merge-recur: if there is no common ancestor, fake empty one
Johannes Schindelin
2006-08-10
merge-recur: do not setenv("GIT_INDEX_FILE")
Johannes Schindelin
2006-08-10
merge-recur: do not call git-write-tree
Johannes Schindelin
2006-08-04
merge-recursive: fix rename handling
Johannes Schindelin
2006-08-01
merge-recur: virtual commits shall never be parsed
Johannes Schindelin
2006-07-31
merge-recur: use the unpack_trees() interface instead of exec()ing read-tree
Johannes Schindelin
2006-07-31
merge-recur: fix thinko in unique_path()
Johannes Schindelin
2006-07-28
merge-recur: Explain why sha_eq() and struct stage_data cannot go
Johannes Schindelin
2006-07-28
merge-recur: Cleanup last mixedCase variables...
Johannes Schindelin
2006-07-28
merge-recur: Fix compiler warning with -pedantic
Johannes Schindelin
2006-07-28
merge-recur: Remove dead code
Johannes Schindelin
2006-07-28
merge-recur: Get rid of debug code
Johannes Schindelin
2006-07-28
merge-recur: Convert variable names to lower_case
Johannes Schindelin
[next]