tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
tests: add a testcase for "git submodule sync"
[git.git]
/
builtin-merge.c
2008-10-03
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-10-01
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-09-30
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-09-29
Shawn O. Pearce
Merge branch 'bc/master-diff-hunk-header-fix'
blob
|
commitdiff
|
raw
2008-09-29
Shawn O. Pearce
Merge branch 'maint' into bc/master-diff-hunk-header-fix
blob
|
commitdiff
|
raw
|
diff to current
2008-09-29
Shawn O. Pearce
Merge branch 'bc/maint-diff-hunk-header-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-09-29
Shawn O. Pearce
Merge branch 'jc/better-conflict-resolution'
blob
|
commitdiff
|
raw
2008-09-29
Shawn O. Pearce
Merge branch 'mg/maint-remote-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-09-26
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-09-25
Shawn O. Pearce
Merge branch 'mv/merge-recursive'
blob
|
commitdiff
|
raw
2008-09-25
Shawn O. Pearce
Merge branch 'jc/alternate-push'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-25
Shawn O. Pearce
Merge branch 'am/status'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-25
Shawn O. Pearce
Merge branch 'pb/autocorrect-wrapper'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-25
Shawn O. Pearce
Merge branch 'mv/commit-tree'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-25
Shawn O. Pearce
Merge branch 'jc/apply-include-exclude'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-25
Shawn O. Pearce
Merge branch 'jc/safe-c-l-d'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-25
Shawn O. Pearce
Merge branch 'ho/dirstat-by-file'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-25
Shawn O. Pearce
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-09-25
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-24
Deskin Miller
maint: check return of split_cmdline to avoid bad confi...
blob
|
commitdiff
|
raw
|
diff to current
2008-09-23
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-23
Junio C Hamano
Merge branch 'bc/maint-diff-hunk-header-fix' into bc...
blob
|
commitdiff
|
raw
|
diff to current
2008-09-22
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-22
Junio C Hamano
Merge branch 'db/maint-checkout-b'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-21
Junio C Hamano
Merge branch 'bc/maint-diff-hunk-header-fix' into bc...
blob
|
commitdiff
|
raw
|
diff to current
2008-09-20
Junio C Hamano
Merge branch 'bc/maint-diff-hunk-header-fix' into bc...
blob
|
commitdiff
|
raw
|
diff to current
2008-09-20
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-19
Junio C Hamano
Merge branch 'bc/maint-diff-hunk-header-fix' into bc...
blob
|
commitdiff
|
raw
|
diff to current
2008-09-19
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-19
Junio C Hamano
Merge branch 'jc/diff-prefix'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-19
Junio C Hamano
Merge branch 'tr/rev-list-reverse'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-19
Junio C Hamano
Merge branch 'cc/bisect'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-19
Junio C Hamano
Merge branch 'jc/maint-name-hash-clear' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-09-16
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-16
Junio C Hamano
Merge branch 'dp/maint-rebase-fix'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-16
Junio C Hamano
Merge branch 'jc/maint-checkout-keep-remove'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-16
Junio C Hamano
Merge branch 'jc/maint-diff-quiet'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-16
Junio C Hamano
Merge branch 'jc/maint-name-hash-clear'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-16
Junio C Hamano
Merge branch 'jc/maint-template-permbits'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-16
Junio C Hamano
Merge branch 'mh/maint-honor-no-ssl-verify'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-13
Junio C Hamano
Sync with 1.6.0.2
blob
|
commitdiff
|
raw
|
diff to current
2008-09-10
Miklos Vajna
commit_tree(): add a new author parameter
blob
|
commitdiff
|
raw
|
diff to current
2008-09-10
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-10
Junio C Hamano
Merge branch 'ho/dashless'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-08
Junio C Hamano
Merge branch 'ar/autospell'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-08
Junio C Hamano
Merge branch 'jc/cc-ld-dynpath'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-08
Junio C Hamano
Merge branch 'jc/hide-cr-in-diff-from-less'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-08
Junio C Hamano
Merge branch 'jc/maint-checkout-fix'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-07
Miklos Vajna
builtin-merge: release the lockfile in try_merge_strategy()
blob
|
commitdiff
|
raw
|
diff to current
2008-09-07
Junio C Hamano
Merge updated git-gui and gitk that call each other
blob
|
commitdiff
|
raw
|
diff to current
2008-09-06
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-06
Junio C Hamano
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2008-09-05
Junio C Hamano
Merge branch 'jc/maint-log-grep'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-03
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-03
Junio C Hamano
Merge branch 'tr/filter-branch'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-03
Junio C Hamano
Merge branch 'np/maint-safer-pack'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-03
Junio C Hamano
Merge branch 'jc/author-nickname'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-03
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-03
Junio C Hamano
Merge branch 'np/maint-safer-pack' into np/pack
blob
|
commitdiff
|
raw
|
diff to current
2008-08-31
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-08-31
Miklos Vajna
builtin-merge: avoid run_command_v_opt() for recursive...
blob
|
commitdiff
|
raw
|
diff to current
2008-08-31
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-08-30
Junio C Hamano
Merge branch 'sp/missing-thin-base' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-08-30
Junio C Hamano
Merge branch 'sb/daemon'
blob
|
commitdiff
|
raw
|
diff to current
2008-08-30
Junio C Hamano
Merge branch 'np/verify-pack' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-08-29
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-08-29
Alex Riesen
Remove useless memset of static command name lists...
blob
|
commitdiff
|
raw
|
diff to current
2008-08-29
Alex Riesen
Remove calculation of the longest command name from...
blob
|
commitdiff
|
raw
|
diff to current
2008-08-28
Junio C Hamano
Merge branch 'mv/merge-custom'
blob
|
commitdiff
|
raw
|
diff to current
2008-08-28
Junio C Hamano
Merge branch 'ml/submodule'
blob
|
commitdiff
|
raw
|
diff to current
2008-08-27
Junio C Hamano
Merge branch 'am/cherry-pick-rerere'
blob
|
commitdiff
|
raw
|
diff to current
2008-08-27
Junio C Hamano
Merge branch 'jc/add-addremove'
blob
|
commitdiff
|
raw
|
diff to current
2008-08-27
Junio C Hamano
Merge branch 'np/verify-pack'
blob
|
commitdiff
|
raw
|
diff to current
2008-08-27
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-08-27
Junio C Hamano
Merge branch 'af/maint-install-no-handlink'
blob
|
commitdiff
|
raw
|
diff to current
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
next
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
