Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅ next
commit
grep
author
committer
pickaxe
?
re
Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix
[gitweb.git]
/
builtin-merge.c
2008-09-23
Merge branch 'bc/maint-diff-hunk-header-fix' into bc...
blob
|
diff
|
raw
2008-09-21
Merge branch 'bc/maint-diff-hunk-header-fix' into bc...
blob
|
diff
|
raw
2008-09-20
Merge branch 'bc/maint-diff-hunk-header-fix' into bc...
blob
|
diff
|
raw
2008-09-19
Merge branch 'bc/maint-diff-hunk-header-fix' into bc...
blob
|
diff
|
raw
2008-09-07
Merge updated git-gui and gitk that call each other
blob
|
diff
|
raw
2008-09-06
Merge branch 'maint'
blob
|
diff
|
raw
2008-09-06
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
diff
|
raw
|
diff to current
2008-09-05
Merge branch 'jc/maint-log-grep'
blob
|
diff
|
raw
2008-09-03
Merge branch 'maint'
blob
|
diff
|
raw
2008-09-03
Merge branch 'tr/filter-branch'
blob
|
diff
|
raw
2008-09-03
Merge branch 'np/maint-safer-pack'
blob
|
diff
|
raw
2008-09-03
Merge branch 'jc/author-nickname'
blob
|
diff
|
raw
2008-09-03
Merge branch 'maint'
blob
|
diff
|
raw
2008-08-31
Merge branch 'maint'
blob
|
diff
|
raw
2008-08-31
Merge branch 'maint'
blob
|
diff
|
raw
2008-08-30
Merge branch 'sp/missing-thin-base' into maint
blob
|
diff
|
raw
|
diff to current
2008-08-30
Merge branch 'sb/daemon'
blob
|
diff
|
raw
2008-08-30
Merge branch 'np/verify-pack' into maint
blob
|
diff
|
raw
|
diff to current
2008-08-29
Merge branch 'maint'
blob
|
diff
|
raw
2008-08-29
Remove useless memset of static command name lists...
blob
|
diff
|
raw
2008-08-29
Remove calculation of the longest command name from...
blob
|
diff
|
raw
|
diff to current
2008-08-28
Merge branch 'mv/merge-custom'
blob
|
diff
|
raw
|
diff to current
2008-08-28
Merge branch 'ml/submodule'
blob
|
diff
|
raw
|
diff to current
2008-08-27
Merge branch 'am/cherry-pick-rerere'
blob
|
diff
|
raw
|
diff to current
2008-08-27
Merge branch 'jc/add-addremove'
blob
|
diff
|
raw
|
diff to current
2008-08-27
Merge branch 'np/verify-pack'
blob
|
diff
|
raw
|
diff to current
2008-08-27
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-08-27
Merge branch 'af/maint-install-no-handlink'
blob
|
diff
|
raw
|
diff to current
2008-08-27
Merge branch 'jc/no-slim-shell'
blob
|
diff
|
raw
|
diff to current
2008-08-27
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-08-24
Merge branch 'jc/no-slim-shell'
blob
|
diff
|
raw
|
diff to current
2008-08-24
Merge branch 'maint' to sync with 1.6.0.1
blob
|
diff
|
raw
|
diff to current
2008-08-24
Merge branch 'ag/maint-combine-diff-fix' into maint
blob
|
diff
|
raw
|
diff to current
2008-08-24
Merge branch 'mv/maint-merge-fix' into maint
blob
|
diff
|
raw
|
diff to current
2008-08-24
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-08-24
merge: fix numerus bugs around "trivial merge" area
blob
|
diff
|
raw
|
diff to current
2008-08-22
provide more errors for the "merge into empty head...
blob
|
diff
|
raw
|
diff to current
2008-08-21
Merge branch 'ml/submodule-foreach'
blob
|
diff
|
raw
|
diff to current
2008-08-21
Merge branch 'pm/log-exit-code'
blob
|
diff
|
raw
|
diff to current
2008-08-21
Merge branch 'sb/commit-tree-minileak'
blob
|
diff
|
raw
|
diff to current
2008-08-21
Merge branch 'pb/reflog-dwim'
blob
|
diff
|
raw
|
diff to current
2008-08-21
Merge branch 'jc/add-stop-at-symlink'
blob
|
diff
|
raw
|
diff to current
2008-08-21
Merge branch 'kh/diff-tree'
blob
|
diff
|
raw
|
diff to current
2008-08-21
Merge branch 'mg/count-objects'
blob
|
diff
|
raw
|
diff to current
2008-08-21
Merge branch 'mz/push-verbose'
blob
|
diff
|
raw
|
diff to current
2008-08-21
Merge branch 'jc/index-extended-flags'
blob
|
diff
|
raw
|
diff to current
2008-08-21
Merge branch 'cc/merge-base-many'
blob
|
diff
|
raw
|
diff to current
2008-08-21
Merge branch 'jc/test-deeper'
blob
|
diff
|
raw
|
diff to current
2008-08-21
Merge branch 'js/parallel-test'
blob
|
diff
|
raw
|
diff to current
2008-08-21
Fix "git-merge -s bogo" help text
blob
|
diff
|
raw
|
diff to current
2008-08-20
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-08-20
"git-merge": allow fast-forwarding in a stat-dirty...
blob
|
diff
|
raw
|
diff to current
2008-08-20
Merge branch 'ph/enable-threaded'
blob
|
diff
|
raw
|
diff to current
2008-08-20
Merge branch 'jk/pager-swap'
blob
|
diff
|
raw
|
diff to current
2008-08-20
Merge branch 'rs/imap'
blob
|
diff
|
raw
|
diff to current
2008-08-17
Merge git-gui 0.11.0
blob
|
diff
|
raw
|
diff to current
2008-08-17
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2008-08-14
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-08-13
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-08-12
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-08-11
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-08-11
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-08-09
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-08-06
Sync with 1.5.6.5
blob
|
diff
|
raw
|
diff to current
2008-08-06
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-08-06
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2008-08-06
Merge branch 'rs/archive-parse-options'
blob
|
diff
|
raw
|
diff to current
2008-08-06
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-08-03
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-08-02
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-08-02
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-07-30
Fix merge name generation in "merge in C"
blob
|
diff
|
raw
|
diff to current
2008-07-30
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-07-30
builtin-merge: allow using a custom strategy
blob
|
diff
|
raw
|
diff to current
2008-07-27
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-07-25
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-07-24
Merge branch 'maint' into ph/checkout
blob
|
diff
|
raw
|
diff to current
2008-07-24
Make non-static functions, that may be static, static
blob
|
diff
|
raw
|
diff to current
2008-07-22
builtin-merge: add missing structure initialization
blob
|
diff
|
raw
|
diff to current
2008-07-22
builtin-merge: give a proper error message for invalid...
blob
|
diff
|
raw
|
diff to current
2008-07-21
Merge branch 'ap/trackinfo'
v1.6.0-rc0
blob
|
diff
|
raw
|
diff to current
2008-07-21
Merge branch 'jc/rerere-auto-more'
blob
|
diff
|
raw
|
diff to current
2008-07-21
Merge branch 'ns/am-abort'
blob
|
diff
|
raw
|
diff to current
2008-07-21
Merge branch 'jc/add-addremove'
blob
|
diff
|
raw
|
diff to current
2008-07-21
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-07-20
builtin-merge.c: Fix option parsing
blob
|
diff
|
raw
|
diff to current
2008-07-20
Teach 'git merge' that some merge strategies no longer...
blob
|
diff
|
raw
|
diff to current
2008-07-19
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-07-17
Merge branch 'mv/dashless'
blob
|
diff
|
raw
|
diff to current
2008-07-17
Merge branch 'ls/mailinfo'
blob
|
diff
|
raw
|
diff to current
2008-07-17
Merge branch 'sb/dashless'
blob
|
diff
|
raw
|
diff to current
2008-07-17
Merge branch 'rs/archive'
blob
|
diff
|
raw
|
diff to current
2008-07-17
Merge branch 'ag/blame'
blob
|
diff
|
raw
|
diff to current
2008-07-17
Merge branch 'rs/rebase-checkout-not-so-quiet'
blob
|
diff
|
raw
|
diff to current
2008-07-17
Merge branch 'sp/maint-index-pack'
blob
|
diff
|
raw
|
diff to current
2008-07-17
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-07-16
Merge branch 'mv/merge-in-c'
blob
|
diff
|
raw
|
diff to current
2008-07-10
Teach merge.log to "git-merge" again
blob
|
diff
|
raw
|
diff to current
2008-07-08
Build in merge
blob
|
diff
|
raw
|
diff to current