tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
bisect: remove "checkout_done" variable used when checking merge bases
[git.git]
/
builtin-rerere.c
2008-08-20
Junio C Hamano
Merge branch 'ph/enable-threaded'
blob
|
commitdiff
|
raw
2008-08-17
Junio C Hamano
Merge git-gui 0.11.0
blob
|
commitdiff
|
raw
2008-08-17
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2008-08-14
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-08-13
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-08-12
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-08-11
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-08-11
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-08-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-08-07
Junio C Hamano
Merge branch 'jc/reflog-expire' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-08-06
Junio C Hamano
Sync with 1.5.6.5
blob
|
commitdiff
|
raw
2008-08-06
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
2008-08-06
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2008-08-06
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-08-03
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-08-02
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-08-02
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-07-30
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
2008-07-27
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
2008-07-25
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-07-24
Junio C Hamano
Merge branch 'maint' into ph/checkout
blob
|
commitdiff
|
raw
2008-07-22
Johannes Schindelin
Rename path_list to string_list
blob
|
commitdiff
|
raw
2008-07-21
Junio C Hamano
Merge branch 'ap/trackinfo'
v1.6.0-rc0
blob
|
commitdiff
|
raw
|
diff to current
2008-07-21
Junio C Hamano
Merge branch 'jc/rerere-auto-more'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-21
Junio C Hamano
Merge branch 'ns/am-abort'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-21
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-19
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-17
Junio C Hamano
Merge branch 'mv/dashless'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-17
Junio C Hamano
Merge branch 'ls/mailinfo'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-17
Junio C Hamano
Merge branch 'sb/dashless'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-17
Junio C Hamano
Merge branch 'rs/archive'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-17
Junio C Hamano
Merge branch 'rs/rebase-checkout-not-so-quiet'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-17
Junio C Hamano
Merge branch 'sp/maint-index-pack'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-17
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-16
Junio C Hamano
Merge branch 'mv/merge-in-c'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-16
Junio C Hamano
Merge branch 'ag/rewrite_one'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-16
Junio C Hamano
Merge branch 'sp/win'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-16
Junio C Hamano
Merge branch 'js/more-win'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-16
Junio C Hamano
Merge branch 'js/maint-pretty-mailmap'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-15
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-07-15
Junio C Hamano
Merge branch 'js/merge-rr'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-15
Junio C Hamano
Merge branch 'sb/rerere-lib'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-15
Junio C Hamano
Merge branch 'ls/maint-mailinfo-patch-label'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-15
Junio C Hamano
Merge branch 'om/rerere-careful'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-15
Junio C Hamano
Merge branch 'jc/branch-merged'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-15
Junio C Hamano
Merge branch 'jc/rebase-orig-head'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-15
Junio C Hamano
Merge branch 'sp/maint-bash-completion-optim'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-13
Junio C Hamano
Merge branch 'sp/maint-bash-completion-optim'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-13
Junio C Hamano
Merge branch 'maint' to sync with 1.5.6.3
blob
|
commitdiff
|
raw
|
diff to current
2008-07-13
Junio C Hamano
Merge branch 'ph/parseopt-step-blame'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-13
Junio C Hamano
Merge branch 'am/stash-branch'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-13
Junio C Hamano
Merge branch 'sg/stash-k-i'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-13
Junio C Hamano
Merge branch 'jc/report-tracking'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-13
Junio C Hamano
Merge branch 'js/pick-root'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-13
Junio C Hamano
Merge branch 'ab/bundle'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-13
Junio C Hamano
Merge branch 'tr/add-i-e'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-13
Stephan Beyer
Make usage strings dash-less
blob
|
commitdiff
|
raw
|
diff to current
2008-07-13
Johannes Schindelin
Move MERGE_RR from .git/rr-cache/ into .git/
blob
|
commitdiff
|
raw
|
diff to current
2008-07-10
Stephan Beyer
rerere: Separate libgit and builtin functions
blob
|
commitdiff
|
raw
|
diff to current
2008-07-10
Olivier Marin
builtin-rerere: more carefully find conflict markers
blob
|
commitdiff
|
raw
|
diff to current
2008-07-09
Junio C Hamano
Merge branch 'jk/pager-config'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-09
Junio C Hamano
Merge branch 'js/apply-root'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-09
Junio C Hamano
Merge branch 'jc/reflog-expire'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-09
Junio C Hamano
Merge branch 'sp/maint-pack-memuse'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-08
Junio C Hamano
Merge branch 'jc/blame' (early part) into HEAD
blob
|
commitdiff
|
raw
|
diff to current
2008-07-08
Junio C Hamano
Merge branch 'lt/racy-empty' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-07-07
Junio C Hamano
Merge branch 'qq/maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-07
Junio C Hamano
Merge branch 'js/maint-daemon-syslog'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-07
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-07
Junio C Hamano
Merge branch 'jc/rerere'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-07
Junio C Hamano
Merge branch 'dr/ceiling'
blob
|
commitdiff
|
raw
|
diff to current
2008-07-06
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-06-27
Junio C Hamano
Merge branch 'maint-1.5.5' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-06-27
Junio C Hamano
Merge branch 'maint-1.5.4' into maint-1.5.5
blob
|
commitdiff
|
raw
|
diff to current
2008-06-25
Junio C Hamano
Merge branch 'sr/tests'
blob
|
commitdiff
|
raw
|
diff to current
2008-06-25
Junio C Hamano
Merge branch 'lw/perlish'
blob
|
commitdiff
|
raw
|
diff to current
2008-06-25
Junio C Hamano
Merge branch 'jc/maint-combine-diff-pre-context' into...
blob
|
commitdiff
|
raw
|
diff to current
2008-06-22
Junio C Hamano
Merge branch 'rs/archive-ignore'
blob
|
commitdiff
|
raw
|
diff to current
2008-06-22
Junio C Hamano
Merge branch 'lt/racy-empty'
blob
|
commitdiff
|
raw
|
diff to current
2008-06-22
Junio C Hamano
Merge branch 'jc/maint-combine-diff-pre-context'
blob
|
commitdiff
|
raw
|
diff to current
2008-06-22
Junio C Hamano
Merge branch 'jk/test'
blob
|
commitdiff
|
raw
|
diff to current
2008-06-22
Junio C Hamano
Merge branch 'mo/status-untracked'
blob
|
commitdiff
|
raw
|
diff to current
2008-06-22
Junio C Hamano
Merge branch 'kh/update-ref'
blob
|
commitdiff
|
raw
|
diff to current
2008-06-22
Junio C Hamano
Merge branch 'jn/web'
blob
|
commitdiff
|
raw
|
diff to current
2008-06-22
Junio C Hamano
Merge branch 'rg/gitweb'
blob
|
commitdiff
|
raw
|
diff to current
2008-06-22
Junio C Hamano
rerere.autoupdate
blob
|
commitdiff
|
raw
|
diff to current
2008-06-22
Junio C Hamano
rerere: remove dubious "tail_optimization"
blob
|
commitdiff
|
raw
|
diff to current
2008-06-22
Junio C Hamano
git-rerere: detect unparsable conflicts
blob
|
commitdiff
|
raw
|
diff to current
2008-06-22
Junio C Hamano
rerere: rerere_created_at() and has_resolution() abstra...
blob
|
commitdiff
|
raw
|
diff to current
2008-06-17
Junio C Hamano
builtin-rerere: fix a small leak
blob
|
commitdiff
|
raw
|
diff to current
2008-06-17
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-06-16
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-06-11
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-06-11
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-06-09
Junio C Hamano
Merge branch 'js/merge-recursive'
blob
|
commitdiff
|
raw
|
diff to current
2008-06-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-06-07
Junio C Hamano
Merge 1.5.5.4 in
blob
|
commitdiff
|
raw
|
diff to current
2008-06-06
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-06-04
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
next