tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Support showing notes from more than one notes tree
[git.git]
/
rerere.c
2010-02-23
Junio C Hamano
Merge branch 'il/rev-glob'
blob
|
commitdiff
|
raw
2010-01-23
Junio C Hamano
Merge branch 'jc/maint-limit-note-output'
blob
|
commitdiff
|
raw
2010-01-23
Junio C Hamano
Merge branch 'nd/ls-files-sparse-fix'
blob
|
commitdiff
|
raw
2010-01-22
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-01-21
Junio C Hamano
Merge branch 'bw/cvsimport'
blob
|
commitdiff
|
raw
2010-01-21
Junio C Hamano
Merge branch 'jc/checkout-merge-base'
blob
|
commitdiff
|
raw
2010-01-21
Junio C Hamano
Merge branch 'ag/patch-header-verify'
blob
|
commitdiff
|
raw
2010-01-21
Junio C Hamano
Merge branch 'jc/conflict-marker-size'
blob
|
commitdiff
|
raw
2010-01-21
Junio C Hamano
Merge branch 'ag/maint-apply-too-large-p'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-21
Junio C Hamano
Merge branch 'ap/merge-backend-opts'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-21
Junio C Hamano
Merge branch 'nd/status-partial-refresh'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-21
Junio C Hamano
Merge remote branch 'remotes/trast-doc/for-next'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-21
Junio C Hamano
Merge branch 'jh/notes' (early part)
blob
|
commitdiff
|
raw
|
diff to current
2010-01-21
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-20
Junio C Hamano
Merge branch 'rr/core-tutorial'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-20
Junio C Hamano
Merge branch 'jc/cache-unmerge'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-20
Junio C Hamano
Merge branch 'js/exec-error-report'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-20
Junio C Hamano
Merge branch 'jc/ls-files-ignored-pathspec'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-20
Junio C Hamano
Merge branch 'jc/grep-lookahead'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-20
Junio C Hamano
Merge branch 'jc/maint-strbuf-add-fix-doubling'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-20
Junio C Hamano
Merge branch 'mm/conflict-advice'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-20
Junio C Hamano
Merge branch 'da/difftool'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-20
Junio C Hamano
Merge branch 'mh/rebase-fixup'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-20
Junio C Hamano
Merge branch 'ns/rebase-auto-squash'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-20
Junio C Hamano
Merge branch 'mh/rebase-fixup' (early part)
blob
|
commitdiff
|
raw
|
diff to current
2010-01-20
Junio C Hamano
Merge branch 'il/push-set-upstream'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-20
Junio C Hamano
Merge branch 'jk/warn-author-committer-after-commit'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-20
Junio C Hamano
Merge branch 'jc/ident'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-20
Junio C Hamano
Merge branch 'tr/http-push-ref-status'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-20
Junio C Hamano
Merge branch 'bk/fix-relative-gitdir-file'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-20
Junio C Hamano
Merge branch 'sd/cd-p-show-toplevel'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-20
Junio C Hamano
Merge branch 'jc/symbol-static'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-20
Junio C Hamano
Sync with 1.6.6.1
blob
|
commitdiff
|
raw
|
diff to current
2010-01-20
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-19
Junio C Hamano
Merge branch 'maint-1.6.4' into maint-1.6.5
blob
|
commitdiff
|
raw
|
diff to current
2010-01-19
Junio C Hamano
Merge branch 'maint-1.6.2' into maint-1.6.3
blob
|
commitdiff
|
raw
|
diff to current
2010-01-19
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-19
Junio C Hamano
Merge branch 'jc/rerere'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-17
Junio C Hamano
Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-17
Junio C Hamano
rerere: honor conflict-marker-size attribute
blob
|
commitdiff
|
raw
|
diff to current
2010-01-17
Junio C Hamano
rerere: prepare for customizable conflict marker length
blob
|
commitdiff
|
raw
|
diff to current
2010-01-17
Junio C Hamano
rerere: use ll_merge() instead of using xdl_merge()
blob
|
commitdiff
|
raw
|
diff to current
2010-01-17
Junio C Hamano
xdl_merge(): introduce xmparam_t for merge specific...
blob
|
commitdiff
|
raw
|
diff to current
2010-01-13
Junio C Hamano
Merge branch 'nd/sparse'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-12
Junio C Hamano
Merge branch 'jc/maint-1.6.4-grep-lookahead' into jc...
blob
|
commitdiff
|
raw
|
diff to current
2010-01-11
Junio C Hamano
rerere forget path: forget recorded resolution
blob
|
commitdiff
|
raw
|
diff to current
2010-01-11
Junio C Hamano
rerere: refactor rerere logic to make it independent...
blob
|
commitdiff
|
raw
|
diff to current
2010-01-10
Junio C Hamano
Merge branch 'maint-1.6.2' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-01-10
Junio C Hamano
Merge branch 'maint-1.6.1' into maint-1.6.2
blob
|
commitdiff
|
raw
|
diff to current
2010-01-10
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-12-31
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-12-30
Junio C Hamano
Merge branch 'maint-1.6.1' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-12-30
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-12-28
Junio C Hamano
Merge branch 'jk/1.7.0-status'
blob
|
commitdiff
|
raw
|
diff to current
2009-12-27
Junio C Hamano
Merge branch 'nf/maint-fix-index-ext-len-on-be64' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-12-26
Junio C Hamano
Merge branch 'jc/1.7.0-diff-whitespace-only-status'
blob
|
commitdiff
|
raw
|
diff to current
2009-12-26
Junio C Hamano
Merge branch 'jc/1.7.0-push-safety'
blob
|
commitdiff
|
raw
|
diff to current
2009-12-26
Junio C Hamano
Merge branch 'jc/1.7.0-send-email-no-thread-default'
blob
|
commitdiff
|
raw
|
diff to current
2009-12-26
Junio C Hamano
rerere: remove silly 1024-byte line limit
blob
|
commitdiff
|
raw
|
diff to current
2009-12-09
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2009-12-09
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2009-12-04
Junio C Hamano
Teach --[no-]rerere-autoupdate option to merge, revert...
blob
|
commitdiff
|
raw
|
diff to current
2009-12-03
Junio C Hamano
Merge branch 'jc/maint-am-keep' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-12-03
Junio C Hamano
Merge branch 'np/maint-sideband-favor-status' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-12-01
Junio C Hamano
Merge branch 'jn/gitweb-blame'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-30
Junio C Hamano
Merge branch 'jc/mailinfo-remove-brackets'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-30
Junio C Hamano
Merge branch 'jc/maint-am-keep'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-21
Junio C Hamano
Merge branch 'jc/fix-tree-walk' (early part)
blob
|
commitdiff
|
raw
|
diff to current
2009-11-18
Junio C Hamano
Merge branch 'np/maint-sideband-favor-status'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-16
Junio C Hamano
Merge branch 'jk/maint-1.6.3-ls-files-i' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-11-16
Junio C Hamano
Merge branch 'jc/maint-blank-at-eof' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-11-16
Junio C Hamano
Merge branch 'jc/maint-1.6.3-graft-trailing-space'...
blob
|
commitdiff
|
raw
|
diff to current
2009-11-16
Junio C Hamano
Merge branch 'tr/maint-roff-quote' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-11-10
Junio C Hamano
Merge branch 'jk/maint-1.6.3-ls-files-i'
blob
|
commitdiff
|
raw
|
diff to current
2009-10-31
Junio C Hamano
Merge branch 'jc/maint-1.6.3-graft-trailing-space'
blob
|
commitdiff
|
raw
|
diff to current
2009-10-31
Junio C Hamano
Merge branch 'tr/maint-roff-quote'
blob
|
commitdiff
|
raw
|
diff to current
2009-10-28
Junio C Hamano
Merge branch 'maint-1.6.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-10-27
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2009-10-25
Junio C Hamano
Merge branch 'maint-1.6.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-10-25
Junio C Hamano
Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached...
blob
|
commitdiff
|
raw
|
diff to current
2009-10-25
Junio C Hamano
Merge branch 'jn/maint-1.6.3-check-ref-format-doc'...
blob
|
commitdiff
|
raw
|
diff to current
2009-10-24
Junio C Hamano
Merge branch 'jp/maint-send-email-fold' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-10-24
Junio C Hamano
Merge branch 'jn/maint-1.6.3-check-ref-format-doc'...
blob
|
commitdiff
|
raw
|
diff to current
2009-10-24
Junio C Hamano
Merge branch 'pv/maint-add-p-no-exclude' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-10-19
Junio C Hamano
Merge branch 'jp/maint-send-email-fold'
blob
|
commitdiff
|
raw
|
diff to current
2009-10-19
Junio C Hamano
Merge branch 'jn/maint-1.6.3-check-ref-format-doc'
blob
|
commitdiff
|
raw
|
diff to current
2009-10-19
Junio C Hamano
Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached'
blob
|
commitdiff
|
raw
|
diff to current
2009-10-19
Junio C Hamano
Merge branch 'jn/gitweb-show-size'
blob
|
commitdiff
|
raw
|
diff to current
2009-10-17
Junio C Hamano
Merge branch 'jc/maint-blank-at-eof'
blob
|
commitdiff
|
raw
|
diff to current
2009-10-17
Junio C Hamano
Merge branch 'maint-1.6.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-10-14
Junio C Hamano
Merge branch 'pv/maint-add-p-no-exclude'
blob
|
commitdiff
|
raw
|
diff to current
2009-10-13
Junio C Hamano
Merge branch 'maint-1.6.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-10-09
Junio C Hamano
Merge branch 'rs/maint-archive-prefix'
blob
|
commitdiff
|
raw
|
diff to current
2009-10-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-10-08
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-10-04
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-10-04
Junio C Hamano
Merge branch 'jc/maint-1.6.4-show-branch-default' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-09-21
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2009-09-20
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-09-16
Junio C Hamano
Merge 1.6.4.4 in
blob
|
commitdiff
|
raw
|
diff to current
next
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
