Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅ next
commit
grep
author
committer
pickaxe
?
re
Fix git-am safety checks
[gitweb.git]
/
merge-recursive.c
2006-09-14
Merge branches 'maint' and 'jc/http'
blob
|
diff
|
raw
2006-09-07
Merge branch 'jc/daemon'
blob
|
diff
|
raw
2006-09-03
Merge branch 'master' into cc/trace
blob
|
diff
|
raw
2006-09-02
Replace uses of strdup with xstrdup.
blob
|
diff
|
raw
2006-09-01
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2006-08-31
Use xmalloc instead of malloc
blob
|
diff
|
raw
|
diff to current
2006-08-28
Merge branch 'gl/web'
blob
|
diff
|
raw
|
diff to current
2006-08-28
Merge branch 'gl/cleanup-next'
blob
|
diff
|
raw
|
diff to current
2006-08-28
Merge branch 'js/c-merge-recursive'
blob
|
diff
|
raw
|
diff to current
2006-08-23
hashcpy/hashcmp remaining bits.
blob
|
diff
|
raw
|
diff to current
2006-08-23
Convert memcpy(a,b,20) to hashcpy(a,b).
blob
|
diff
|
raw
|
diff to current
2006-08-23
Merge branch 'gl/cleanup' into gl/cleanup-next
blob
|
diff
|
raw
|
diff to current
2006-08-13
Merge branch 'master' into js/c-merge-recursive
blob
|
diff
|
raw
|
diff to current
2006-08-09
merge-recur: do not die unnecessarily
blob
|
diff
|
raw
|
diff to current
2006-08-09
merge-recur: try to merge older merge bases first
blob
|
diff
|
raw
|
diff to current
2006-08-09
merge-recur: if there is no common ancestor, fake empty one
blob
|
diff
|
raw
|
diff to current
2006-08-09
merge-recur: do not setenv("GIT_INDEX_FILE")
blob
|
diff
|
raw
|
diff to current
2006-08-09
merge-recur: do not call git-write-tree
blob
|
diff
|
raw
|
diff to current
2006-08-04
merge-recursive: fix rename handling
blob
|
diff
|
raw
|
diff to current
2006-07-31
merge-recur: virtual commits shall never be parsed
blob
|
diff
|
raw
|
diff to current
2006-07-31
merge-recur: use the unpack_trees() interface instead...
blob
|
diff
|
raw
|
diff to current
2006-07-31
Merge branch 'js/read-tree' into js/c-merge-recursive
blob
|
diff
|
raw
|
diff to current
2006-07-30
merge-recur: fix thinko in unique_path()
blob
|
diff
|
raw
|
diff to current
2006-07-28
merge-recur: Explain why sha_eq() and struct stage_data...
blob
|
diff
|
raw
|
diff to current
2006-07-28
merge-recur: Cleanup last mixedCase variables...
blob
|
diff
|
raw
|
diff to current
2006-07-28
merge-recur: Fix compiler warning with -pedantic
blob
|
diff
|
raw
|
diff to current
2006-07-28
merge-recur: Remove dead code
blob
|
diff
|
raw
|
diff to current
2006-07-28
merge-recur: Get rid of debug code
blob
|
diff
|
raw
|
diff to current
2006-07-28
merge-recur: Convert variable names to lower_case
blob
|
diff
|
raw
|
diff to current
2006-07-28
Cumulative update of merge-recursive in C
blob
|
diff
|
raw
|
diff to current
2006-07-14
Merge branch 'lt/unitype' into js/c-merge-recursive
blob
|
diff
|
raw
|
diff to current
2006-07-14
Status update on merge-recursive in C
blob
|
diff
|
raw
|
diff to current