repo.or.cz
/
git
/
gitweb.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
J
u
ni
o
C Hamano
rerere: re
m
ove a
n
null statement
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-05-11
Jun
i
o C Hamano
rer
e
re: pl
u
g memory leaks
upon "rer
e
re
f
o
rget" fai
l
ure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-06
J
unio C Hamano
rerere: adjust 'fo
r
get
'
to
m
ul
t
i-variant wo
r
ld order
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-06
Junio C Hamano
r
e
rere:
s
plit code to call ll_merge() further
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-06
Junio C Ham
a
no
rerere: move code rela
t
ed to "fo
r
g
e
t" toge
t
her
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-06
Junio C H
a
mano
rerer
e
: gc and clear
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-15
Junio C
H
amano
rerere: do us
e
multiple variants
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-15
Junio C Hamano
t4200: rerere
a merge w
i
th
two ident
i
c
a
l conflicts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-15
Junio C Hamano
rerere: a
l
low multi
p
le varian
t
s to ex
i
st
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-15
Junio
C
Hamano
r
e
rer
e
:
delay th
e
recordi
n
g of prei
m
age
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-15
Junio C Hamano
rerere: handle leftover rr-cach
e
/
$
I
D directory a
n
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-02-08
J
unio C Haman
o
rerere: scan $GIT_DIR/rr-cache/
$
ID when instant
i
atin
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-02-08
Junio
C Haman
o
rerere
:
spli
t
co
n
f
lic
t
ID
further
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C H
a
mano
rerere: u
n
-
nest merg
e
() fu
r
ther
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hamano
re
r
e
r
e: use "struc
t
rerere_id" inst
e
ad of
"char *"
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hamano
rerere: call confli
c
t-i
d
s IDs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio
C
Ha
m
ano
rerer
e
: fu
r
ther clarify do_rerere_o
n
e_path()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hamano
re
r
e
r
e: further de
-
dent
do_plain_
r
erere()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
J
u
n
io
C H
a
mano
rerere: refa
c
tor "repla
y
" p
a
rt of do_plain_rerere()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hamano
rerere: explain the re
m
ainder
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C H
a
mano
rerere: explain "rerere for
g
e
t
"
c
o
d
epath
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Ju
n
io C Hama
n
o
r
erere:
e
x
plain
t
h
e pr
i
mary codep
a
t
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hama
n
o
rerere:
explain MER
G
E_RR mana
g
e
ment help
e
r
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hamano
r
erere: fix b
e
nign off-
b
y
-
one non
-
bug
an
d
c
la
r
ify code
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C
H
ama
n
o
rere
r
e:
explai
n
the rerere I/O abstrac
t
io
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Ju
n
io C Hamano
rerere
:
do not
leak
m
mfile[]
f
or a path with multiple
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
J
u
n
i
o C Hama
n
o
rerere: stop looping unnecess
a
r
i
ly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Ju
n
i
o
C Hamano
rerere: drop want_sp
par
a
me
t
er from i
s
_cmarker()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C H
a
mano
rerere: report aut
o
updated path
s
only a
f
ter ac
t
ually
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Jun
i
o C Ham
a
no
rerere: write out e
a
ch r
e
co
r
d of MER
G
E_R
R
in one
g
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C H
a
m
a
no
rer
e
re: lift PAT
H
_MA
X
li
m
it
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C
Ham
a
no
rerere: plug
c
onfli
c
t I
D
leaks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Juni
o
C Hamano
re
r
ere: handl
e
c
o
n
flicts with mu
l
tiple stage #1 entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-28
Junio C
H
ama
n
o
rerere:
fix a
n
off
-
by-on
e
n
on
-
b
u
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Ham
a
no
Git 2
.
3
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
ama
n
o
Merge bran
c
h 'mm/usage-log-l-can-take-regex' into maint-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio
C
Ham
a
no
Merge branch
'
j
c
/dif
f
-no-ind
e
x-d-f' into maint-
2
.
3
commit
|
commitdiff
|
tree
2015-05-11
J
u
ni
o
C H
a
mano
Merge branch 'oh
/
fix-config
-
default-user-name-section
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
am
a
no
Merg
e
bran
c
h 'jc/epochtime-wo-tz' in
t
o maint-2
.
3
commit
|
commitdiff
|
tree
2015-04-27
J
u
n
i
o
C Hamano
G
i
t 2
.
3
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-27
J
unio
C
Hamano
Merge branch 'tb/connect-ipv6-
p
a
rse-fi
x
' into maint
commit
|
commitdiff
|
tree
2015-04-27
Junio C Hamano
Merge branch
'ma/bas
h
-comple
t
ion-leaking-
x
' i
n
to
main
t
commit
|
commitdiff
|
tree
2015-04-27
Junio C Haman
o
Merge
bra
n
ch 'jc/push-cer
t
' i
n
to m
a
int
commit
|
commitdiff
|
tree
2015-04-21
Ju
n
io C Hamano
Git 2
.
3
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-21
J
u
n
io C Hamano
Me
r
ge branch
'
jk/colors' in
t
o maint
commit
|
commitdiff
|
tree
2015-04-21
Juni
o
C
H
amano
M
e
rge branch 'jk/tes
t
-
a
nnoyance
s
' into
maint
commit
|
commitdiff
|
tree
2015-04-21
Ju
n
io C Hamano
Merg
e
branch 'pt/enter-rep
o
-
comment-fix' int
o
maint
commit
|
commitdiff
|
tree
2015-04-21
Junio
C Ha
m
a
n
o
Merge branch
'
jz
/
git
w
eb-conf-doc-fix' into main
t
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
M
e
rge br
a
nc
h
'
j
k
/
c
h
e
rry-pick-docfix
'
into
m
a
i
nt
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Merge branch 'iu/fi
x
-parse-op
t
ions
-
h-comment' into
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Junio
C
Hamano
Merge branch 'jg/cguide-we-cann
o
t-count' into
m
a
int
commit
|
commitdiff
|
tree
2015-04-21
Junio
C
Hamano
Mer
g
e branch 'jk/pa
c
k-
c
orruption-post-mort
e
m' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
J
u
nio C Hamano
M
erge br
a
nch 'jn/doc-fast-impor
t
-no-16-
o
ctop
u
s-limit
.
.
.
commit
|
commitdiff
|
tree
2015-04-15
Junio C
H
amano
parse_da
t
e_basic(): let the sy
s
tem handle DST co
n
ve
r
sion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-15
J
u
nio C Hamano
p
arse
_
date_basic
(
): return early
w
hen giv
e
n a bogus
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-02
J
un
i
o C Hamano
push -
-
s
ig
n
ed:
t
ighten
w
hat
the
r
eceiv
i
ng e
n
d
can
ask
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-31
J
u
ni
o
C
Hamano
G
i
t 2
.
3
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-31
Junio C
Hamano
Merge bran
c
h 'ss/pull-rebas
e
-preser
v
e
' into
maint
commit
|
commitdiff
|
tree
2015-03-31
Ju
n
io C Hamano
Merge bran
c
h 'jc/report-path-error-to-
d
ir' i
n
to maint
commit
|
commitdiff
|
tree
2015-03-31
Junio C Hama
n
o
Merge branch 'p
h
/pu
s
h
-
doc
-
cas' into maint
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
Prep
a
re for 2
.
3
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
Me
r
ge bra
n
ch 'sg
/
complet
i
on-gitcomp-nl-for-
r
efs' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Junio
C
Hamano
Merg
e
bra
n
ch
'
jk/sim
p
lify-csum-f
i
le-sha
1
fd-che
c
k' into
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Junio C Ham
a
no
Merge branch 'tg/
t
est-index-v4' into main
t
commit
|
commitdiff
|
tree
2015-03-28
Junio C Haman
o
Me
r
ge branch 'nd/do
c
-git-index-version' into mai
n
t
commit
|
commitdiff
|
tree
2015-03-28
Juni
o
C Hamano
Merge bra
n
ch '
c
t/prompt-untr
a
cked-fix' into maint
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
M
e
rge bran
c
h 'ws/gre
p
-quiet-no-pager' into maint
commit
|
commitdiff
|
tree
2015-03-28
Ju
n
io
C Hamano
M
e
rge branch 'jc/submitting-patches-m
e
ntion-send-
e
mail
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Junio
C
Hamano
M
e
rg
e
branch
'jk
/
c
leanup-fa
i
led-clo
n
e' into maint
commit
|
commitdiff
|
tree
2015-03-28
Junio C
Ham
a
no
Merge bran
c
h 'j
k
/f
e
tch-pack' into maint
commit
|
commitdiff
|
tree
2015-03-28
J
un
i
o C Hamano
M
e
r
g
e bra
n
ch '
t
g
/
fix-check-order-with-sp
l
it
-
index'
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Juni
o
C Ha
m
ano
Merge
b
ranch
'
j
k
/prune-w
i
th-
c
orrupt-refs'
in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2015-03-27
Junio C Hamano
Me
r
ge branch
'
j
k
/ta
g
-h-column-is
-
a-listi
n
g
-option'
.
.
.
commit
|
commitdiff
|
tree
2015-03-27
Junio C Haman
o
Merg
e
b
r
anch 'jk/sm
a
r
t-http-hi
d
e
-refs' into
m
a
i
nt
commit
|
commitdiff
|
tree
2015-03-27
J
u
nio C Hamano
Merge
b
ranc
h
'js/completion-c
t
ags-pat
t
ern-substitution
.
.
.
commit
|
commitdiff
|
tree
2015-03-27
Junio C
H
a
m
a
no
Upd
a
te mailmap
to spell out "Alexander Kulesho
v
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-26
J
u
nio C Ham
a
no
diff-no-index: ali
g
n D/F handling with that of normal Git
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-26
Juni
o
C
H
amano
diff-no-inde
x
: D
W
IM
"diff D F" into "diff D/F
F"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-24
Junio C Hamano
report_pat
h
_error(): mo
v
e
to dir
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-23
Junio C Hama
n
o
Gi
t
2
.
3
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-23
Junio C Ha
m
ano
Merge branch 'rs/us
e
-isxdig
i
t' into maint
commit
|
commitdiff
|
tree
2015-03-23
Junio C Ham
a
no
Merge
b
ranch 'rs/deflat
e
-
i
nit-cleanup' into mai
n
t
commit
|
commitdiff
|
tree
2015-03-23
Junio C
H
a
man
o
Merge branch 'ak/git-done-help-cleanup'
into ma
i
nt
commit
|
commitdiff
|
tree
2015-03-23
Ju
n
io C Haman
o
Merge branc
h
'sg/co
m
p
leti
o
n-remote'
i
nto maint
commit
|
commitdiff
|
tree
2015-03-23
Junio C Hamano
Merge b
r
anch 'm
g
/doc-s
t
atu
s
-color-slot' into maint
commit
|
commitdiff
|
tree
2015-03-23
Junio C Hamano
Merge b
r
a
n
c
h
'
j
c/decorate-lea
k
y-separator-color'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2015-03-23
Junio C H
a
mano
Merge branc
h
'kn/git-cd-to
-
empt
y
' into maint
commit
|
commitdiff
|
tree
2015-03-23
Junio C Hamano
Merge b
r
anch 'km/ima
p
-
s
end-l
i
bcurl-
o
p
tions
'
into maint
commit
|
commitdiff
|
tree
2015-03-23
Juni
o
C Hamano
Merge bra
n
ch 'mg/verify-
c
ommi
t
'
i
nto maint
commit
|
commitdiff
|
tree
2015-03-23
Junio C Hamano
Me
r
ge branc
h
'es/rebase-i-coun
t
-
todo'
in
t
o
maint
commit
|
commitdiff
|
tree
2015-03-23
Juni
o
C Ham
a
no
Merg
e
branc
h
'tb/con
n
ect-ipv6-p
a
rs
e
-f
i
x' into maint
commit
|
commitdiff
|
tree
2015-03-15
Junio C Hamano
Su
b
mittingPatc
h
e
s: encourage user
s
to use fo
r
mat-patch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-14
Juni
o
C Hamano
Git
2
.
3
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-14
Junio C Hamano
Merge branch '
m
r/
d
oc-clean-f
-
f' into main
t
commit
|
commitdiff
|
tree
2015-03-14
Junio C Ha
m
ano
Merge
b
ranch 'ak/t5516
-
typofix' 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
Junio C Hamano
Merge
b
ranch 'jk/di
f
fcor
e
-rename-duplicate' into maint
commit
|
commitdiff
|
tree
2015-03-14
Junio
C
Hama
n
o
M
e
rge branch
'bw/kwset-use-unsigned' in
t
o
maint
commit
|
commitdiff
|
tree
2015-03-14
J
u
nio C Hamano
Merge branch
'
nd/gr
e
p-exclude-standard-he
l
p-fix' into
.
.
.
commit
|
commitdiff
|
tree
2015-03-14
Junio
C
Hamano
M
e
rg
e
branch 'mg/doc-r
e
mote-tags-or-not'
i
n
to
m
a
i
n
t
commit
|
commitdiff
|
tree
next