Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅ next
commit
grep
author
committer
pickaxe
?
re
t6023: merge-file fails to output anything for a degenerate merge
[gitweb.git]
/
builtin-merge.c
2009-04-27
builtin-merge: fix a typo in an error message
blob
|
diff
|
raw
2009-01-07
Merge branch 'maint-1.5.6' into maint-1.6.0
blob
|
diff
|
raw
|
diff to current
2008-12-20
GIT 1.6.0.6
v1.6.0.6
blob
|
diff
|
raw
|
diff to current
2008-11-02
Merge branch 'js/maint-fetch-update-head' into maint
blob
|
diff
|
raw
|
diff to current
2008-11-02
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
diff
|
raw
|
diff to current
2008-10-18
Merge branch 'db/maint-checkout-b' into maint
blob
|
diff
|
raw
|
diff to current
2008-10-09
Merge branch 'sg/maint-intrebase-msghook' into maint
blob
|
diff
|
raw
|
diff to current
2008-10-09
Merge branch 'jk/maint-soliconv' into maint
blob
|
diff
|
raw
|
diff to current
2008-10-09
builtin-merge.c: allocate correct amount of memory
blob
|
diff
|
raw
|
diff to current
2008-09-29
Merge branch 'bc/maint-diff-hunk-header-fix' into maint
blob
|
diff
|
raw
|
diff to current
2008-09-29
Merge branch 'mg/maint-remote-fix' into maint
blob
|
diff
|
raw
|
diff to current
2008-09-24
maint: check return of split_cmdline to avoid bad confi...
blob
|
diff
|
raw
|
diff to current
2008-09-19
Merge branch 'jc/maint-name-hash-clear' into maint
blob
|
diff
|
raw
|
diff to current
2008-09-06
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
diff
|
raw
|
diff to current
2008-08-30
Merge branch 'sp/missing-thin-base' into maint
blob
|
diff
|
raw
|
diff to current
2008-08-30
Merge branch 'np/verify-pack' into maint
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: fix numerus bugs around "trivial merge" area
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-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-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