tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first
⋅
prev
⋅ next
fix multiple issues in index-pack
[git.git]
/
builtin-merge.c
2008-08-27
Junio C Hamano
Merge branch 'jc/no-slim-shell'
blob
|
commitdiff
|
raw
|
diff to current
2008-08-27
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-08-24
Junio C Hamano
Merge branch 'jc/no-slim-shell'
blob
|
commitdiff
|
raw
|
diff to current
2008-08-24
Junio C Hamano
Merge branch 'maint' to sync with 1.6.0.1
blob
|
commitdiff
|
raw
|
diff to current
2008-08-24
Junio C Hamano
Merge branch 'ag/maint-combine-diff-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-08-24
Junio C Hamano
Merge branch 'mv/maint-merge-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-08-24
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-08-24
Junio C Hamano
merge: fix numerus bugs around "trivial merge" area
blob
|
commitdiff
|
raw
|
diff to current
2008-08-22
Paolo Bonzini
provide more errors for the "merge into empty head...
blob
|
commitdiff
|
raw
|
diff to current
2008-08-21
Junio C Hamano
Merge branch 'ml/submodule-foreach'
blob
|
commitdiff
|
raw
|
diff to current
2008-08-21
Junio C Hamano
Merge branch 'pm/log-exit-code'
blob
|
commitdiff
|
raw
|
diff to current
2008-08-21
Junio C Hamano
Merge branch 'sb/commit-tree-minileak'
blob
|
commitdiff
|
raw
|
diff to current
2008-08-21
Junio C Hamano
Merge branch 'pb/reflog-dwim'
blob
|
commitdiff
|
raw
|
diff to current
2008-08-21
Junio C Hamano
Merge branch 'jc/add-stop-at-symlink'
blob
|
commitdiff
|
raw
|
diff to current
2008-08-21
Junio C Hamano
Merge branch 'kh/diff-tree'
blob
|
commitdiff
|
raw
|
diff to current
2008-08-21
Junio C Hamano
Merge branch 'mg/count-objects'
blob
|
commitdiff
|
raw
|
diff to current
2008-08-21
Junio C Hamano
Merge branch 'mz/push-verbose'
blob
|
commitdiff
|
raw
|
diff to current
2008-08-21
Junio C Hamano
Merge branch 'jc/index-extended-flags'
blob
|
commitdiff
|
raw
|
diff to current
2008-08-21
Junio C Hamano
Merge branch 'cc/merge-base-many'
blob
|
commitdiff
|
raw
|
diff to current
2008-08-21
Junio C Hamano
Merge branch 'jc/test-deeper'
blob
|
commitdiff
|
raw
|
diff to current
2008-08-21
Junio C Hamano
Merge branch 'js/parallel-test'
blob
|
commitdiff
|
raw
|
diff to current
2008-08-21
Junio C Hamano
Fix "git-merge -s bogo" help text
blob
|
commitdiff
|
raw
|
diff to current
2008-08-20
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-08-20
Junio C Hamano
"git-merge": allow fast-forwarding in a stat-dirty...
blob
|
commitdiff
|
raw
|
diff to current
2008-08-20
Junio C Hamano
Merge branch 'ph/enable-threaded'
blob
|
commitdiff
|
raw
|
diff to current
2008-08-20
Junio C Hamano
Merge branch 'jk/pager-swap'
blob
|
commitdiff
|
raw
|
diff to current
2008-08-20
Junio C Hamano
Merge branch 'rs/imap'
blob
|
commitdiff
|
raw
|
diff to current
2008-08-17
Junio C Hamano
Merge git-gui 0.11.0
blob
|
commitdiff
|
raw
|
diff to current
2008-08-17
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-08-14
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-08-13
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-08-12
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-08-11
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-08-11
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-08-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-08-06
Junio C Hamano
Sync with 1.5.6.5
blob
|
commitdiff
|
raw
|
diff to current
2008-08-06
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-08-06
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-08-06
Junio C Hamano
Merge branch 'rs/archive-parse-options'
blob
|
commitdiff
|
raw
|
diff to current
2008-08-06
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-08-03
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-08-02
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-08-02
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-30
Junio C Hamano
Fix merge name generation in "merge in C"
blob
|
commitdiff
|
raw
|
diff to current
2008-07-30
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-07-30
Miklos Vajna
builtin-merge: allow using a custom strategy
blob
|
commitdiff
|
raw
|
diff to current
2008-07-27
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-07-25
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-24
Junio C Hamano
Merge branch 'maint' into ph/checkout
blob
|
commitdiff
|
raw
|
diff to current
2008-07-24
Stephan Beyer
Make non-static functions, that may be static, static
blob
|
commitdiff
|
raw
|
diff to current
2008-07-22
Pierre Habouzit
builtin-merge: add missing structure initialization
blob
|
commitdiff
|
raw
|
diff to current
2008-07-22
Miklos Vajna
builtin-merge: give a proper error message for invalid...
blob
|
commitdiff
|
raw
|
diff to current
2008-07-21
Junio C Hamano
Merge branch 'ap/trackinfo'
v1.6.0-rc0
blob
|
commitdiff
|
raw
|
diff to current
2008-07-21
Junio C Hamano
Merge branch 'jc/rerere-auto-more'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-21
Junio C Hamano
Merge branch 'ns/am-abort'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-21
Junio C Hamano
Merge branch 'jc/add-addremove'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-21
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-20
Michele Ballabio
builtin-merge.c: Fix option parsing
blob
|
commitdiff
|
raw
|
diff to current
2008-07-20
Miklos Vajna
Teach 'git merge' that some merge strategies no longer...
blob
|
commitdiff
|
raw
|
diff to current
2008-07-19
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-17
Junio C Hamano
Merge branch 'mv/dashless'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-17
Junio C Hamano
Merge branch 'ls/mailinfo'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-17
Junio C Hamano
Merge branch 'sb/dashless'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-17
Junio C Hamano
Merge branch 'rs/archive'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-17
Junio C Hamano
Merge branch 'ag/blame'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-17
Junio C Hamano
Merge branch 'rs/rebase-checkout-not-so-quiet'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-17
Junio C Hamano
Merge branch 'sp/maint-index-pack'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-17
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-16
Junio C Hamano
Merge branch 'mv/merge-in-c'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-10
Junio C Hamano
Teach merge.log to "git-merge" again
blob
|
commitdiff
|
raw
|
diff to current
2008-07-08
Miklos Vajna
Build in merge
blob
|
commitdiff
|
raw
|
diff to current