Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
Merge branch 'doc-style/for-next' of git://repo.or.cz/git/trast
[gitweb.git]
/
git-merge-octopus.sh
2010-01-23
Merge branch 'jc/branch-d'
blob
|
diff
|
raw
2010-01-23
Merge branch 'js/refer-upstream'
blob
|
diff
|
raw
2010-01-21
Merge branch 'jc/checkout-merge-base'
blob
|
diff
|
raw
2010-01-21
Merge branch 'ag/patch-header-verify'
blob
|
diff
|
raw
2010-01-21
Merge branch 'jc/conflict-marker-size'
blob
|
diff
|
raw
2010-01-21
Merge branch 'ag/maint-apply-too-large-p'
blob
|
diff
|
raw
2010-01-21
Merge branch 'ap/merge-backend-opts'
blob
|
diff
|
raw
2010-01-21
Merge branch 'jh/notes' (early part)
blob
|
diff
|
raw
2010-01-21
Merge branch 'jc/maint-refresh-index-is-optional-for...
blob
|
diff
|
raw
2010-01-20
Merge branch 'rr/core-tutorial'
blob
|
diff
|
raw
2010-01-20
Merge branch 'jc/cache-unmerge'
blob
|
diff
|
raw
2010-01-20
Merge branch 'js/exec-error-report'
blob
|
diff
|
raw
2010-01-20
Merge branch 'jc/grep-lookahead'
blob
|
diff
|
raw
2010-01-20
Merge branch 'jc/maint-strbuf-add-fix-doubling'
blob
|
diff
|
raw
2010-01-20
Merge branch 'mm/conflict-advice'
blob
|
diff
|
raw
2010-01-20
Merge branch 'da/difftool'
blob
|
diff
|
raw
2010-01-20
Merge branch 'mh/rebase-fixup'
blob
|
diff
|
raw
2010-01-20
Merge branch 'ns/rebase-auto-squash'
blob
|
diff
|
raw
2010-01-20
Merge branch 'mh/rebase-fixup' (early part)
blob
|
diff
|
raw
2010-01-20
Merge branch 'jk/warn-author-committer-after-commit'
blob
|
diff
|
raw
2010-01-20
Merge branch 'tr/http-push-ref-status'
blob
|
diff
|
raw
2010-01-20
Merge branch 'sd/cd-p-show-toplevel'
blob
|
diff
|
raw
2010-01-20
Merge branch 'bg/maint-remote-update-default' into...
blob
|
diff
|
raw
2010-01-20
Merge branch 'sb/maint-octopus' into maint
blob
|
diff
|
raw
2010-01-20
Merge branch 'bg/maint-add-all-doc' into maint
blob
|
diff
|
raw
|
diff to current
2010-01-20
Merge branch 'maint-1.6.5' into maint
blob
|
diff
|
raw
|
diff to current
2010-01-20
Merge branch 'maint'
blob
|
diff
|
raw
2010-01-19
Merge branch 'maint'
blob
|
diff
|
raw
2010-01-19
Merge branch 'dp/maint-1.6.5-fast-import-non-commit...
blob
|
diff
|
raw
|
diff to current
2010-01-19
Merge branch 'jc/rerere'
blob
|
diff
|
raw
2010-01-19
Merge branch 'pc/uninteresting-submodule-disappear...
blob
|
diff
|
raw
2010-01-19
Merge branch 'nd/include-termios-for-osol'
blob
|
diff
|
raw
2010-01-19
Merge branch 'jm/maint-1.6.5-grep-NUL-terminate' into...
blob
|
diff
|
raw
|
diff to current
2010-01-18
Merge branch 'tc/test-locate-httpd'
blob
|
diff
|
raw
2010-01-18
Merge branch 'jh/commit-status'
blob
|
diff
|
raw
2010-01-17
Merge branch 'jn/makefile'
blob
|
diff
|
raw
2010-01-17
Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'
blob
|
diff
|
raw
2010-01-17
Merge branch 'tc/clone-v-progress'
blob
|
diff
|
raw
2010-01-17
Merge branch 'tc/smart-http-restrict'
blob
|
diff
|
raw
2010-01-17
Merge branch 'jk/run-command-use-shell'
blob
|
diff
|
raw
2010-01-17
Merge branch 'sr/gfi-options'
blob
|
diff
|
raw
2010-01-17
Merge branch 'maint'
blob
|
diff
|
raw
2010-01-17
Merge branch 'cc/reset-more'
blob
|
diff
|
raw
2010-01-13
Merge branch 'jc/checkout-merge-base'
blob
|
diff
|
raw
2010-01-13
Merge branch 'rs/maint-archive-match-pathspec'
blob
|
diff
|
raw
2010-01-13
Merge branch 'il/vcs-helper'
blob
|
diff
|
raw
2010-01-13
Merge branch 'cc/reset-more'
blob
|
diff
|
raw
2010-01-13
Merge branch 'nd/sparse'
blob
|
diff
|
raw
2010-01-12
Merge branch 'maint'
blob
|
diff
|
raw
2010-01-12
Merge branch 'jc/maint-1.6.4-grep-lookahead' into jc...
blob
|
diff
|
raw
|
diff to current
2010-01-10
Merge branch 'tr/http-updates'
blob
|
diff
|
raw
2010-01-10
Merge branch 'jk/maint-1.6.5-reset-hard'
blob
|
diff
|
raw
2010-01-10
Merge branch 'jk/push-to-delete'
blob
|
diff
|
raw
2010-01-10
Merge branch 'mm/config-path'
blob
|
diff
|
raw
2010-01-10
Merge branch 'pm/cvs-environ'
blob
|
diff
|
raw
2010-01-10
Merge branch 'tr/maint-1.6.5-bash-prompt-show-submodule...
blob
|
diff
|
raw
2010-01-10
Merge branch 'bg/maint-remote-update-default'
blob
|
diff
|
raw
2010-01-10
Merge branch 'mm/diag-path-in-treeish'
blob
|
diff
|
raw
2010-01-10
Merge branch 'fc/opt-quiet-gc-reset'
blob
|
diff
|
raw
2010-01-10
Merge branch 'maint'
blob
|
diff
|
raw
2010-01-10
Merge branch 'maint-1.6.2' into maint
blob
|
diff
|
raw
|
diff to current
2010-01-10
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
diff
|
raw
|
diff to current
2010-01-07
Merge branch 'js/filter-branch-prime'
blob
|
diff
|
raw
2010-01-07
Merge branch 'sb/maint-octopus'
blob
|
diff
|
raw
2010-01-07
Merge branch 'bg/maint-add-all-doc'
blob
|
diff
|
raw
|
diff to current
2009-12-31
Merge branch 'maint-1.6.0' into maint
blob
|
diff
|
raw
|
diff to current
2009-12-30
Merge branch 'maint-1.6.1' into maint
blob
|
diff
|
raw
|
diff to current
2009-12-30
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
diff
|
raw
|
diff to current
2009-12-28
Merge branch 'jk/1.7.0-status'
blob
|
diff
|
raw
|
diff to current
2009-12-27
Merge branch 'nf/maint-fix-index-ext-len-on-be64' into...
blob
|
diff
|
raw
|
diff to current
2009-12-26
Merge branch 'jc/1.7.0-diff-whitespace-only-status'
blob
|
diff
|
raw
|
diff to current
2009-12-26
Merge branch 'jc/1.7.0-push-safety'
blob
|
diff
|
raw
|
diff to current
2009-12-26
Merge branch 'jc/1.7.0-send-email-no-thread-default'
blob
|
diff
|
raw
|
diff to current
2009-12-26
Merge branch 'sr/vcs-helper'
blob
|
diff
|
raw
|
diff to current
2009-12-22
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2009-12-20
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2009-12-16
Merge branch 'maint' to sync with 1.6.5.7
blob
|
diff
|
raw
|
diff to current
2009-12-14
octopus: remove dead code
blob
|
diff
|
raw
2009-12-14
octopus: reenable fast-forward merges
blob
|
diff
|
raw
|
diff to current
2009-12-14
octopus: make merge process simpler to follow
blob
|
diff
|
raw
|
diff to current
2009-12-11
Sync with 1.6.5.6
blob
|
diff
|
raw
|
diff to current
2009-12-09
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2009-12-09
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2009-12-09
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2009-12-07
Merge branch 'master' into il/vcs-helper
blob
|
diff
|
raw
|
diff to current
2009-12-05
Sync with 1.6.5.5
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'jc/maint-am-keep' into maint
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge in 1.6.5.4
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2009-12-02
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2009-12-01
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2009-12-01
Merge branch 'jc/deprecate-old-syntax-from-merge'
blob
|
diff
|
raw
|
diff to current
2009-12-01
Merge branch 'jn/gitweb-blame'
blob
|
diff
|
raw
|
diff to current
2009-11-30
Merge branch 'fc/maint-format-patch-pathspec-dashes'
blob
|
diff
|
raw
|
diff to current
2009-11-30
Merge branch 'mm/maint-merge-ff-error-message-fix'
blob
|
diff
|
raw
|
diff to current
2009-11-30
Merge branch 'ap/maint-merge-strategy-list-fix'
blob
|
diff
|
raw
|
diff to current
2009-11-30
Merge branch 'jc/pretty-lf'
blob
|
diff
|
raw
|
diff to current
2009-11-30
Merge branch 'cc/bisect-doc'
blob
|
diff
|
raw
|
diff to current
2009-11-30
Merge branch 'em/commit-claim'
blob
|
diff
|
raw
|
diff to current
next