Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
rebase: Support preserving merges in non-interactive mode
[gitweb.git]
/
unpack-trees.c
2008-09-29
Merge branch 'maint' into bc/master-diff-hunk-header-fix
blob
|
diff
|
raw
2008-09-29
Merge branch 'bc/maint-diff-hunk-header-fix' into maint
blob
|
diff
|
raw
2008-09-29
Merge branch 'jc/better-conflict-resolution'
blob
|
diff
|
raw
2008-09-29
Merge branch 'mg/maint-remote-fix' into maint
blob
|
diff
|
raw
2008-09-25
Merge branch 'mv/merge-recursive'
blob
|
diff
|
raw
2008-09-25
Merge branch 'jc/alternate-push'
blob
|
diff
|
raw
2008-09-25
Merge branch 'am/status'
blob
|
diff
|
raw
2008-09-25
Merge branch 'pb/autocorrect-wrapper'
blob
|
diff
|
raw
2008-09-25
Merge branch 'mv/commit-tree'
blob
|
diff
|
raw
2008-09-25
Merge branch 'jc/apply-include-exclude'
blob
|
diff
|
raw
2008-09-25
Merge branch 'jc/safe-c-l-d'
blob
|
diff
|
raw
2008-09-25
Merge branch 'ho/dirstat-by-file'
blob
|
diff
|
raw
2008-09-25
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
2008-09-19
Merge branch 'jc/diff-prefix'
blob
|
diff
|
raw
2008-09-19
Merge branch 'np/pack'
blob
|
diff
|
raw
2008-09-19
Merge branch 'bw/shortref'
blob
|
diff
|
raw
2008-09-19
Merge branch 'rs/decorate'
blob
|
diff
|
raw
2008-09-19
Merge branch 'tr/rev-list-reverse'
blob
|
diff
|
raw
2008-09-19
Merge branch 'cc/bisect'
blob
|
diff
|
raw
2008-09-19
Merge branch 'jc/setlinebuf-setvbuf'
blob
|
diff
|
raw
2008-09-19
Merge branch 'dp/maint-rebase-fix' into maint
blob
|
diff
|
raw
2008-09-19
Merge branch 'jc/maint-checkout-keep-remove' into maint
blob
|
diff
|
raw
2008-09-19
Merge branch 'jc/maint-name-hash-clear' into maint
blob
|
diff
|
raw
|
diff to current
2008-09-16
Merge branch 'maint'
blob
|
diff
|
raw
2008-09-16
Merge branch 'dp/maint-rebase-fix'
blob
|
diff
|
raw
2008-09-16
Merge branch 'jc/maint-checkout-keep-remove'
blob
|
diff
|
raw
2008-09-16
Merge branch 'jc/maint-name-hash-clear'
blob
|
diff
|
raw
|
diff to current
2008-09-10
checkout: do not lose staged removal
blob
|
diff
|
raw
2008-09-08
Merge branch 'jc/cc-ld-dynpath'
blob
|
diff
|
raw
|
diff to current
2008-09-07
Merge updated git-gui and gitk that call each other
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-09-03
Merge branch 'tr/filter-branch'
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 'sb/daemon'
blob
|
diff
|
raw
|
diff to current
2008-08-30
Merge branch 'np/verify-pack' into maint
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 'jc/no-slim-shell'
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'
blob
|
diff
|
raw
|
diff to current
2008-08-24
unpack_trees(): protect the handcrafted in-core index...
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-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-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-15
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-07-08
Merge branch 'jc/blame' (early part) into HEAD
blob
|
diff
|
raw
|
diff to current
2008-07-08
Merge branch 'lt/racy-empty' into maint
blob
|
diff
|
raw
|
diff to current
2008-07-07
Merge branch 'dr/ceiling'
blob
|
diff
|
raw
|
diff to current
2008-07-06
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-06-27
Merge branch 'maint-1.5.5' into maint
blob
|
diff
|
raw
|
diff to current
2008-06-27
Merge branch 'maint-1.5.4' into maint-1.5.5
blob
|
diff
|
raw
|
diff to current
2008-06-25
Merge branch 'jc/maint-combine-diff-pre-context' into...
blob
|
diff
|
raw
|
diff to current
2008-06-22
Merge branch 'lt/racy-empty'
blob
|
diff
|
raw
|
diff to current
2008-06-22
Merge branch 'jc/maint-combine-diff-pre-context'
blob
|
diff
|
raw
|
diff to current
2008-06-17
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-06-16
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-06-11
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2008-06-11
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-06-09
Merge branch 'js/merge-recursive'
blob
|
diff
|
raw
|
diff to current
2008-06-09
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-06-07
Merge 1.5.5.4 in
blob
|
diff
|
raw
|
diff to current
2008-06-06
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-06-04
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-06-02
Merge branch 'sb/am-tests'
blob
|
diff
|
raw
|
diff to current
2008-06-02
Merge branch 'lw/test-fix'
blob
|
diff
|
raw
|
diff to current
2008-06-02
Merge branch 'sp/remote'
blob
|
diff
|
raw
|
diff to current
2008-06-02
Merge branch 'lt/pack-sync'
blob
|
diff
|
raw
|
diff to current
2008-06-02
Merge branch 'np/pack-check'
blob
|
diff
|
raw
|
diff to current
2008-06-02
Merge branch 'jb/reset-q'
blob
|
diff
|
raw
|
diff to current
2008-06-02
Merge branch 'jc/checkout'
blob
|
diff
|
raw
|
diff to current
2008-05-30
unpack_trees(): allow callers to differentiate worktree...
blob
|
diff
|
raw
|
diff to current
2008-05-28
Merge 1.5.5.3 in
blob
|
diff
|
raw
|
diff to current
2008-05-27
Merge branch 'jc/diff-no-no-index'
blob
|
diff
|
raw
|
diff to current
2008-05-27
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-05-27
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-05-26
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-05-26
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
|
diff to current
2008-05-25
Merge branch 'js/config-cb'
v1.5.6-rc0
blob
|
diff
|
raw
|
diff to current
2008-05-25
Merge branch 'as/graph'
blob
|
diff
|
raw
|
diff to current
2008-05-25
Merge branch 'js/mailinfo'
blob
|
diff
|
raw
|
diff to current
2008-05-25
Merge branch 'jc/add-n-u'
blob
|
diff
|
raw
|
diff to current
2008-05-25
Merge branch 'ar/t6031'
blob
|
diff
|
raw
|
diff to current
2008-05-25
Merge branch 'db/clone-in-c'
blob
|
diff
|
raw
|
diff to current
2008-05-25
Merge branch 'jc/apply-whitespace'
blob
|
diff
|
raw
|
diff to current
2008-05-25
Merge branch 'jc/unpack-trees-reword'
blob
|
diff
|
raw
|
diff to current
2008-05-25
Merge branch 'ar/batch-cat'
blob
|
diff
|
raw
|
diff to current
2008-05-25
Merge branch 'ap/svn'
blob
|
diff
|
raw
|
diff to current
2008-05-24
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2008-05-23
Merge branch 'pb/push'
blob
|
diff
|
raw
|
diff to current
2008-05-23
Merge branch 'bc/repack'
blob
|
diff
|
raw
|
diff to current
2008-05-23
Merge branch 'sp/ignorecase'
blob
|
diff
|
raw
|
diff to current
2008-05-23
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-05-23
Merge branch 'maint-1.5.4' into maint
v1.5.5.2
blob
|
diff
|
raw
|
diff to current
2008-05-21
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
next