Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
Documentation: describe --thin more accurately
[gitweb.git]
/
rerere.c
2010-02-16
Merge branch 'maint-1.6.6' into maint
blob
|
diff
|
raw
2010-02-15
Merge branch 'maint-1.6.6' into maint
blob
|
diff
|
raw
2010-02-12
Merge branch 'maint'
blob
|
diff
|
raw
2010-02-12
Merge branch 'maint'
blob
|
diff
|
raw
2010-02-10
Sync with 1.6.6.2
blob
|
diff
|
raw
2010-02-10
Merge branch 'jh/maint-config-file-prefix' into maint
blob
|
diff
|
raw
|
diff to current
2010-02-10
Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge...
blob
|
diff
|
raw
|
diff to current
2010-02-09
Merge branch 'maint'
blob
|
diff
|
raw
2010-02-09
Merge branch 'jc/maint-push-doc-status' into maint
blob
|
diff
|
raw
|
diff to current
2010-02-08
Merge branch 'jc/maint-imap-config-parse' into maint
blob
|
diff
|
raw
|
diff to current
2010-02-08
Merge branch 'jc/maint-doc-git-add-example' into maint
blob
|
diff
|
raw
|
diff to current
2010-02-07
Merge git://repo.or.cz/git-gui
v1.7.0-rc2
blob
|
diff
|
raw
2010-02-07
Merge branch 'maint'
blob
|
diff
|
raw
2010-02-06
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
2010-02-06
Merge branch 'maint'
blob
|
diff
|
raw
2010-02-03
Merge branch 'ms/filter-branch-submodule'
blob
|
diff
|
raw
2010-02-03
Merge branch 'sp/fast-import-large-blob'
blob
|
diff
|
raw
2010-02-01
Merge branch 'sp/maint-fast-import-large-blob' into...
blob
|
diff
|
raw
|
diff to current
2010-01-30
Merge branch 'maint'
blob
|
diff
|
raw
2010-01-29
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
2010-01-28
Merge branch 'maint'
blob
|
diff
|
raw
2010-01-28
rerere: fix too-short initialization
blob
|
diff
|
raw
2010-01-28
Merge branch 'gp/maint-cvsserver'
blob
|
diff
|
raw
|
diff to current
2010-01-27
Merge branch 'jc/maint-reflog-bad-timestamp'
blob
|
diff
|
raw
|
diff to current
2010-01-27
Merge branch 'il/maint-colon-address'
blob
|
diff
|
raw
|
diff to current
2010-01-27
Merge branch 'il/maint-xmallocz'
blob
|
diff
|
raw
|
diff to current
2010-01-27
Merge branch 'jh/maint-config-file-prefix'
blob
|
diff
|
raw
|
diff to current
2010-01-25
Merge branch 'jc/fix-tree-walk'
blob
|
diff
|
raw
|
diff to current
2010-01-24
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2010-01-24
Merge branch 'maint' of git://git.spearce.org/git-gui...
blob
|
diff
|
raw
|
diff to current
2010-01-24
Merge branch 'doc-style/for-next' of git://repo.or...
blob
|
diff
|
raw
|
diff to current
2010-01-23
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2010-01-23
Merge branch 'jc/branch-d'
blob
|
diff
|
raw
|
diff to current
2010-01-23
Merge branch 'il/rev-glob'
blob
|
diff
|
raw
|
diff to current
2010-01-23
Merge branch 'js/refer-upstream'
blob
|
diff
|
raw
|
diff to current
2010-01-23
Merge branch 'jl/submodule-diff'
blob
|
diff
|
raw
|
diff to current
2010-01-23
Merge branch 'il/remote-updates'
blob
|
diff
|
raw
|
diff to current
2010-01-23
Merge branch 'il/branch-set-upstream'
blob
|
diff
|
raw
|
diff to current
2010-01-23
Merge branch 'jc/maint-limit-note-output'
blob
|
diff
|
raw
|
diff to current
2010-01-23
Merge branch 'nd/ls-files-sparse-fix'
blob
|
diff
|
raw
|
diff to current
2010-01-22
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2010-01-21
Merge branch 'bw/cvsimport'
blob
|
diff
|
raw
|
diff to current
2010-01-21
Merge branch 'jc/checkout-merge-base'
blob
|
diff
|
raw
|
diff to current
2010-01-21
Merge branch 'ag/patch-header-verify'
blob
|
diff
|
raw
|
diff to current
2010-01-21
Merge branch 'jc/conflict-marker-size'
blob
|
diff
|
raw
|
diff to current
2010-01-21
Merge branch 'ag/maint-apply-too-large-p'
blob
|
diff
|
raw
|
diff to current
2010-01-21
Merge branch 'ap/merge-backend-opts'
blob
|
diff
|
raw
|
diff to current
2010-01-21
Merge branch 'nd/status-partial-refresh'
blob
|
diff
|
raw
|
diff to current
2010-01-21
Merge remote branch 'remotes/trast-doc/for-next'
blob
|
diff
|
raw
|
diff to current
2010-01-21
Merge branch 'jh/notes' (early part)
blob
|
diff
|
raw
|
diff to current
2010-01-21
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2010-01-20
Merge branch 'rr/core-tutorial'
blob
|
diff
|
raw
|
diff to current
2010-01-20
Merge branch 'jc/cache-unmerge'
blob
|
diff
|
raw
|
diff to current
2010-01-20
Merge branch 'js/exec-error-report'
blob
|
diff
|
raw
|
diff to current
2010-01-20
Merge branch 'jc/ls-files-ignored-pathspec'
blob
|
diff
|
raw
|
diff to current
2010-01-20
Merge branch 'jc/grep-lookahead'
blob
|
diff
|
raw
|
diff to current
2010-01-20
Merge branch 'jc/maint-strbuf-add-fix-doubling'
blob
|
diff
|
raw
|
diff to current
2010-01-20
Merge branch 'mm/conflict-advice'
blob
|
diff
|
raw
|
diff to current
2010-01-20
Merge branch 'da/difftool'
blob
|
diff
|
raw
|
diff to current
2010-01-20
Merge branch 'mh/rebase-fixup'
blob
|
diff
|
raw
|
diff to current
2010-01-20
Merge branch 'ns/rebase-auto-squash'
blob
|
diff
|
raw
|
diff to current
2010-01-20
Merge branch 'mh/rebase-fixup' (early part)
blob
|
diff
|
raw
|
diff to current
2010-01-20
Merge branch 'il/push-set-upstream'
blob
|
diff
|
raw
|
diff to current
2010-01-20
Merge branch 'jk/warn-author-committer-after-commit'
blob
|
diff
|
raw
|
diff to current
2010-01-20
Merge branch 'jc/ident'
blob
|
diff
|
raw
|
diff to current
2010-01-20
Merge branch 'tr/http-push-ref-status'
blob
|
diff
|
raw
|
diff to current
2010-01-20
Merge branch 'bk/fix-relative-gitdir-file'
blob
|
diff
|
raw
|
diff to current
2010-01-20
Merge branch 'sd/cd-p-show-toplevel'
blob
|
diff
|
raw
|
diff to current
2010-01-20
Merge branch 'jc/symbol-static'
blob
|
diff
|
raw
|
diff to current
2010-01-20
Sync with 1.6.6.1
blob
|
diff
|
raw
|
diff to current
2010-01-20
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2010-01-19
Merge branch 'maint-1.6.4' into maint-1.6.5
blob
|
diff
|
raw
|
diff to current
2010-01-19
Merge branch 'maint-1.6.2' into maint-1.6.3
blob
|
diff
|
raw
|
diff to current
2010-01-19
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2010-01-19
Merge branch 'jc/rerere'
blob
|
diff
|
raw
|
diff to current
2010-01-17
Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'
blob
|
diff
|
raw
|
diff to current
2010-01-17
rerere: honor conflict-marker-size attribute
blob
|
diff
|
raw
|
diff to current
2010-01-17
rerere: prepare for customizable conflict marker length
blob
|
diff
|
raw
|
diff to current
2010-01-17
rerere: use ll_merge() instead of using xdl_merge()
blob
|
diff
|
raw
|
diff to current
2010-01-17
xdl_merge(): introduce xmparam_t for merge specific...
blob
|
diff
|
raw
|
diff to current
2010-01-13
Merge branch 'nd/sparse'
blob
|
diff
|
raw
|
diff to current
2010-01-12
Merge branch 'jc/maint-1.6.4-grep-lookahead' into jc...
blob
|
diff
|
raw
|
diff to current
2010-01-11
rerere forget path: forget recorded resolution
blob
|
diff
|
raw
|
diff to current
2010-01-11
rerere: refactor rerere logic to make it independent...
blob
|
diff
|
raw
|
diff to current
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.1' into maint-1.6.2
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
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
rerere: remove silly 1024-byte line limit
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-04
Teach --[no-]rerere-autoupdate option to merge, revert...
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'jc/maint-am-keep' into maint
blob
|
diff
|
raw
|
diff to current
next