repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
rerere: remove an null statement
2016-05-19
Junio
C
Hamano
r
e
rere: remove
a
n
null
s
tate
m
e
nt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-05-11
Junio C Hamano
rerere
:
plug
m
emory leaks upon "rerere forget" failure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-06
J
unio C Ham
a
no
rer
e
re: adju
s
t 'fo
r
get' to multi-variant
w
o
r
ld or
d
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-06
Junio
C Haman
o
r
ere
r
e: split code to call ll_merge() f
u
rthe
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-06
Junio C
Ha
m
ano
r
e
r
ere: move
c
ode related to "
f
o
rget" together
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-06
Juni
o
C Hamano
rerere: gc and cle
a
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-15
Junio
C
Hamano
rerere: do use multiple variants
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-15
Jun
i
o C Hamano
t4200: re
r
ere a merge
with
two identical c
o
nflicts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-15
Junio C Hamano
rerere: allo
w
multiple varia
n
ts to exist
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-15
Junio
C Hama
n
o
rer
e
r
e: delay t
h
e
r
ecording of preimage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-15
Junio C Hamano
rerere: handle leftover rr-
c
a
c
h
e/$ID
d
i
r
ectory and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-02-08
Junio C Ha
m
ano
rer
e
re: s
c
a
n $GIT_DIR/rr-cache/$ID w
h
en i
n
stantiat
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-02-08
Junio C Ha
m
ano
rerere: s
p
l
it conflict ID furth
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Ham
a
n
o
rerere:
u
n-nest merge() further
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hamano
rerere:
use "struc
t
rerer
e
_id" i
n
s
t
ead of "char *
"
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
J
unio C Ha
m
ano
rerere: call conflict-i
d
s IDs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Ju
n
io C
H
amano
rerere: further clarify do_re
r
ere_one_path()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Haman
o
rerer
e
:
f
urther de-
d
ent d
o
_plain_rer
e
re()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Ha
m
ano
rerere:
r
efactor "replay" part of do_p
l
ai
n
_rerere()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
J
unio C Hamano
rerere: expl
a
in
t
he re
m
ai
n
der
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Ha
m
a
n
o
rerer
e
: exp
l
ain "rere
r
e forget" codepath
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Juni
o
C
Hamano
rerer
e
: ex
p
lain the prima
r
y codepat
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio
C
Hamano
rerere: expl
a
in ME
R
GE
_
RR management helpers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Ham
a
no
rerer
e
: fi
x
benign o
f
f-by-one n
o
n-bug a
n
d
clarify code
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hamano
rerere: explai
n
the rerer
e
I/O abstr
a
ction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Ham
a
no
r
ere
r
e: do not
leak mmf
i
le[
]
for a path with multiple
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
J
u
nio C Haman
o
re
r
er
e
:
s
t
o
p l
o
oping unnecessarily
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio
C
Ha
m
ano
rerere: drop
w
ant_sp paramet
e
r
from is_cmarker()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Jun
i
o C Hamano
rerere: report
autoupdated
p
aths
only aft
e
r
actuall
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hamano
rerere: write
out each
r
e
c
o
r
d of MER
G
E_RR in one go
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio
C
H
amano
re
r
ere:
l
ift PATH_MAX limitation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hamano
rerere: plug confl
i
ct I
D
l
eak
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hamano
r
erere: han
d
le c
o
nfli
c
ts wi
t
h
m
ultiple stage
#
1 ent
r
i
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-28
Ju
n
io C Hamano
rerere: fix an off-by-o
n
e non-bug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ha
m
ano
Git 2
.
3
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
io C
H
amano
Merge branch 'mm/usage-lo
g
-
l
-
c
an
-
t
a
ke-regex' into main
t
-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Hamano
Merge branch
'
j
c
/diff-
n
o-index-d-f' into maint-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Hamano
M
erge branch 'oh/fix-config-def
a
ult-user-name-s
e
ctio
n
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
H
am
a
no
Merge branc
h
'jc/epochtime-
w
o-tz' int
o
maint-2
.
3
commit
|
commitdiff
|
tree
2015-04-27
J
unio
C
Hamano
Git 2
.
3
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-27
J
u
nio C Hamano
Merge
b
r
anch 'tb
/
con
n
e
ct-ipv6
-
parse-fix' i
n
t
o maint
commit
|
commitdiff
|
tree
2015-04-27
Jun
i
o C Ha
m
ano
M
e
rge br
a
nc
h
'ma/bash-com
p
letion-leaking-x' into maint
commit
|
commitdiff
|
tree
2015-04-27
J
unio C Ha
m
ano
M
e
rge b
r
anch 'jc/push-cer
t
' into
m
aint
commit
|
commitdiff
|
tree
2015-04-21
Ju
n
io C Ham
a
no
Gi
t
2
.
3
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Merge branch 'jk/col
o
rs' into ma
i
nt
commit
|
commitdiff
|
tree
2015-04-21
Junio C Haman
o
Merge b
r
anch '
j
k/tes
t
-annoyances' int
o
maint
commit
|
commitdiff
|
tree
2015-04-21
Junio
C Hamano
Merge branch
'
pt/e
n
ter-repo-c
o
m
m
en
t
-fix' into maint
commit
|
commitdiff
|
tree
2015-04-21
Ju
n
io C Ha
m
a
no
Mer
g
e
b
r
a
nc
h
'jz/
g
itw
e
b
-conf-d
o
c-fix
'
int
o
maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C
H
amano
M
e
r
ge bran
c
h 'jk/cher
r
y-pick
-
d
ocfix' int
o
maint
commit
|
commitdiff
|
tree
2015-04-21
Juni
o
C Hamano
M
erge branch 'iu
/
fix-
p
arse-opt
i
ons-h-co
m
ment' int
o
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Merge branch
'jg
/
cguide-we-ca
n
not-count' i
n
to main
t
commit
|
commitdiff
|
tree
2015-04-21
J
u
nio C Hamano
Merge
branch 'jk
/
pack
-
corruption
-
p
o
s
t-morte
m
' into
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Merge branch 'j
n
/doc-fast-impor
t
-no-16-octopus-limit
.
.
.
commit
|
commitdiff
|
tree
2015-04-15
Jun
i
o
C
H
ama
n
o
parse_da
t
e_basic(): let the system hand
l
e DST conversi
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-15
Junio C Ham
a
no
parse_date_basic(): return early when g
i
ve
n
a bogus
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-02
Junio C Haman
o
push --
s
ig
n
ed: tighten what
the
r
e
cei
v
ing end can ask
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-31
Ju
n
io C
Ham
a
no
G
i
t 2
.
3
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-31
J
u
n
io C Hamano
Me
r
ge branch 'ss/pull-rebase-preserve' into
m
aint
commit
|
commitdiff
|
tree
2015-03-31
Junio C Hamano
Merge br
a
nch 'jc/report-path-error-to-dir' into
maint
commit
|
commitdiff
|
tree
2015-03-31
Jun
i
o
C Ha
m
ano
Merge branch 'ph/push-do
c
-c
a
s' into mai
n
t
commit
|
commitdiff
|
tree
2015-03-28
Jun
i
o C Hamano
Prepare f
o
r 2
.
3
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-28
Jun
i
o
C
Hamano
Merge branch '
s
g/compl
e
tion
-
gitcomp-n
l
-for-refs' into
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Ju
n
io
C Haman
o
M
e
rge branch 'jk/
s
implify-
c
s
um-file-sha1fd-check' into
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
J
unio
C
Hama
n
o
Merge
b
ranch 't
g
/te
s
t-i
n
dex-v4' into maint
commit
|
commitdiff
|
tree
2015-03-28
J
u
n
io C Hamano
Merge
bra
n
c
h
'nd/
d
oc-git-i
n
d
ex
-
ver
s
i
on
'
i
n
t
o maint
commit
|
commitdiff
|
tree
2015-03-28
Junio C Haman
o
M
erge bra
n
ch 'ct/
p
ro
m
pt-unt
r
a
cked-fix' int
o
maint
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
Merge branch 'ws/grep-quiet-no
-
pager' into
m
aint
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
Merge branch 'jc/s
u
bmittin
g
-pa
t
ches
-
menti
o
n-send-ema
i
l
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
J
u
nio C Ha
m
a
n
o
Merge branch 'jk/
c
leanup-fail
e
d-clone' into maint
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hama
n
o
Merge
b
ra
n
ch 'jk/fetc
h
-p
a
ck' in
t
o m
a
int
commit
|
commitdiff
|
tree
2015-03-28
Jun
i
o C
Haman
o
Merge branch
'tg/fix-check-ord
e
r-with-spl
i
t-index'
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Juni
o
C Hamano
Me
r
g
e
b
r
anch
'
jk/prune-with-c
o
rru
p
t-refs' into maint
commit
|
commitdiff
|
tree
2015-03-27
Jun
i
o
C Hamano
Merge branch
'jk
/
tag-h-column-is-a-lis
t
ing-opt
i
on'
.
.
.
commit
|
commitdiff
|
tree
2015-03-27
J
u
nio C H
a
mano
Merge branch 'jk/smart-http-hide-re
f
s' into m
a
int
commit
|
commitdiff
|
tree
2015-03-27
Junio C
Ham
a
no
Merge
b
ranch 'js/com
p
letion
-
ctags-pa
t
t
e
rn-subst
i
tution
.
.
.
commit
|
commitdiff
|
tree
2015-03-27
J
uni
o
C H
a
mano
Up
d
a
t
e ma
i
lma
p
to spell
out
"Alexander Kuleshov"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-26
Junio C Ha
m
ano
diff-no-
i
ndex: align
D
/F
handl
i
ng wi
t
h that o
f
normal Git
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-26
Junio C H
a
mano
diff-no
-
index: DWIM "diff D F" in
t
o "diff D/F F"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-24
J
uni
o
C Hamano
repor
t
_
p
ath_error(): move
to dir
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-23
J
u
n
i
o C Ham
a
no
Git
2
.
3
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-23
J
u
nio
C
Hamano
Merge
b
r
a
n
ch 'rs/use-
i
sxdigit' into m
a
int
commit
|
commitdiff
|
tree
2015-03-23
Junio C Ham
a
no
Merge branch 'rs
/
deflate
-
i
n
it-cleanup' i
n
to maint
commit
|
commitdiff
|
tree
2015-03-23
Ju
n
i
o C
H
am
a
no
Mer
g
e
branch 'ak/git-done-help
-
c
l
eanup' into m
a
int
commit
|
commitdiff
|
tree
2015-03-23
Junio C
Ha
m
ano
M
e
rge branch 'sg/c
o
mpletio
n
-remote' i
n
to m
a
int
commit
|
commitdiff
|
tree
2015-03-23
Junio C Hamano
Merge
b
ranch 'mg/doc
-
status-color
-
slo
t
' in
t
o
maint
commit
|
commitdiff
|
tree
2015-03-23
Junio C H
a
ma
n
o
Merge branch 'jc
/
d
ecorat
e
-leaky-sepa
r
ator-co
l
or' into
.
.
.
commit
|
commitdiff
|
tree
2015-03-23
Junio C Hamano
Merge branc
h
'kn/git-cd-to-empty'
into ma
i
nt
commit
|
commitdiff
|
tree
2015-03-23
Jun
i
o C Hama
n
o
Merg
e
branch 'km/im
a
p-se
n
d-l
i
bcurl-opti
o
ns'
into maint
commit
|
commitdiff
|
tree
2015-03-23
Junio
C
Hamano
Merge branch 'mg
/
v
e
rify-co
m
mit' into maint
commit
|
commitdiff
|
tree
2015-03-23
Junio
C Hamano
Merge
b
ra
n
ch 'es/rebase-i-
c
ount-todo' int
o
m
a
i
nt
commit
|
commitdiff
|
tree
2015-03-23
J
un
i
o
C Hamano
Merge branch 'tb/connect-
i
pv6-pa
r
s
e-fix' into
m
aint
commit
|
commitdiff
|
tree
2015-03-15
Juni
o
C Hamano
Sub
m
ittingP
a
tches
:
encour
a
ge
users to
u
s
e format-patc
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-14
Junio C Haman
o
G
it 2
.
3
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-14
Junio C Hamano
M
e
rge branch 'mr/doc-
c
lean-f
-
f'
i
n
to maint
commit
|
commitdiff
|
tree
2015-03-14
Junio C Hamano
Merge br
a
nch
'
a
k
/t5516
-
t
yp
o
f
i
x' into maint
commit
|
commitdiff
|
tree
2015-03-14
Junio C Hamano
M
e
rge branch 'jc/diff-test-updates' into maint
commit
|
commitdiff
|
tree
2015-03-14
J
u
n
i
o
C Hamano
M
e
rge bran
c
h 'jk/diffcore-rename-d
u
plica
t
e'
i
n
to maint
commit
|
commitdiff
|
tree
2015-03-14
J
u
nio
C
Hama
n
o
Merge br
a
nc
h
'bw/kwset-
u
s
e
-unsigned' into maint
commit
|
commitdiff
|
tree
2015-03-14
J
u
nio C
H
am
a
no
M
erg
e
branch 'nd/grep-exclude-sta
n
dard-help
-
fix' into
.
.
.
commit
|
commitdiff
|
tree
2015-03-14
Jun
i
o C Ham
a
no
Merge br
a
nc
h
'mg/doc-remote-tags-or-not' into maint
commit
|
commitdiff
|
tree
next