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
J
u
nio C Hama
n
o
r
erere: remove
an null statement
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-05-11
Junio C Hamano
rerere: plu
g
memo
r
y leaks up
o
n "r
e
rere forget" failur
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-04-06
Junio
C
Hamano
rerere: adjust 'forget' to multi-varian
t
world or
d
er
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-04-06
Ju
n
io C H
a
mano
r
e
r
e
re: split code to call ll
_
mer
g
e() further
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-04-06
Junio C Ha
m
ano
rere
r
e:
move code re
l
ated
t
o
"f
o
rget" t
o
geth
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-04-06
Ju
n
io C Ham
a
no
rerere: gc and
clear
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-03-15
Ju
n
io C Ha
m
ano
rerere: do use
mu
l
t
i
p
le variant
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-03-15
Junio C Hama
n
o
t4200: rerere a merge with two i
d
en
t
i
c
al c
o
nfl
i
cts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-03-15
Junio C Hamano
rerere: all
o
w
m
ultiple vari
a
nts to exist
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-03-15
Jun
i
o
C Hamano
rerere: delay
t
he
r
ecording of preimag
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-03-15
Jun
i
o C Hamano
rerere
:
handle
leftover rr-cache/
$
I
D directory and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-08
Jun
i
o C Hamano
rerere:
s
can $GI
T
_
D
I
R/rr-
c
ache/$I
D
when insta
n
tiati
n
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-02-08
J
unio C Hamano
rer
e
re:
split
c
onflict ID further
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
J
u
ni
o
C Ha
m
ano
r
e
rer
e
:
un
-
nest
m
e
rg
e
(
)
furthe
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Junio C
H
ama
n
o
re
r
ere: use "struc
t
rerere_id" instead of
"
char *"
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
J
u
nio C Hamano
rerer
e
: call conflict-i
d
s IDs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hamano
rerere
:
further cla
r
ify
do_
r
erere_
o
ne_path()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hamano
rerer
e
: fu
r
t
her de-den
t
do_plain_
r
er
e
re(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hamano
rerere: r
e
f
a
ctor
"rep
l
ay
"
p
a
rt
o
f do_plain
_
r
e
rere()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Jun
i
o
C Ham
a
n
o
rerere: explain the remainder
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Junio C
H
a
ma
n
o
rerere
:
e
xpla
i
n "rerere forget
"
co
d
epath
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
J
u
nio C Hama
n
o
r
e
rere: e
x
plain t
h
e p
r
imary
c
odepa
t
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
J
u
nio C Ham
a
no
rerere
:
explain MERGE_RR
m
a
nagement h
e
lpers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Junio
C
Hama
n
o
re
r
ere: fix benign off-by-one non
-
bug a
n
d
c
lari
f
y code
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Junio
C Ha
m
ano
rer
e
re: explain
t
he
r
e
rere I/O ab
s
t
r
acti
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Junio
C
Ha
m
an
o
rerere: do n
o
t
le
a
k
m
m
file
[
] for
a path with multiple
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Junio
C
Hamano
rere
r
e:
s
top looping
u
nnec
e
ssar
i
ly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Ju
n
io C Hamano
r
erere: drop wan
t
_
s
p parame
t
er from is_cmarker()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Junio C
H
amano
re
r
e
re:
r
e
p
ort aut
o
updated
path
s
only after actua
l
ly
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Haman
o
r
e
rere: write
o
ut each rec
o
rd of
M
ERGE
_
RR in one go
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hamano
rerere: lift PATH_MAX limitation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Juni
o
C Hamano
rer
e
re: p
l
ug conflict ID
l
eaks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Junio C H
a
mano
r
e
rere: h
a
ndle co
n
f
licts wit
h
multiple st
a
ge #1
entrie
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-28
Junio C Ha
m
ano
rerere: fix an off-b
y
-one non-bu
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
H
am
a
n
o
G
it 2
.
3
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C Hamano
Merg
e
b
r
anch 'mm/usage-log-l-ca
n
-take-regex'
in
t
o maint-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o C Haman
o
Merge branch 'jc
/
diff-no-
i
nde
x
-d-f'
int
o
m
a
int-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o C Hamano
Merge b
r
anch 'oh/fix-config-default-
u
s
e
r-name-sectio
n
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C Hama
n
o
Merge branch 'jc/epoch
t
i
m
e-w
o
-tz' into m
a
int-2
.
3
commit
|
commitdiff
|
tree
2015-04-27
Juni
o
C
Hamano
Git 2
.
3
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-27
Junio C Ha
m
ano
Merge branch 'tb/connect-ipv6-
p
arse-
f
ix' into maint
commit
|
commitdiff
|
tree
2015-04-27
J
u
nio C Ha
m
ano
Me
r
ge b
r
anch 'ma/bas
h
-c
o
mpletion-le
a
k
i
ng-x' into ma
i
nt
commit
|
commitdiff
|
tree
2015-04-27
J
unio C H
a
ma
n
o
Merge branch
'
j
c/push-
c
ert' into maint
commit
|
commitdiff
|
tree
2015-04-21
Ju
n
i
o
C
Ham
a
no
Git 2
.
3
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-21
Ju
n
i
o C Hamano
Mer
g
e
b
ranch 'jk
/
colors' into ma
i
nt
commit
|
commitdiff
|
tree
2015-04-21
J
unio C Hamano
Merge branch 'jk/t
e
st-annoyances' into ma
i
nt
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Merge
bran
c
h 'pt/enter-re
p
o-comm
e
nt-fix'
i
nto m
a
int
commit
|
commitdiff
|
tree
2015-04-21
Junio C
Ham
a
no
Merge branch 'jz/
g
itweb-conf-doc-
f
ix' into ma
i
nt
commit
|
commitdiff
|
tree
2015-04-21
Junio C
H
amano
Merge b
r
an
c
h
'
j
k/cherry-pick-docfix' into maint
commit
|
commitdiff
|
tree
2015-04-21
Ju
n
io
C
Hamano
Merge
bran
c
h 'iu/fix-parse-opti
o
ns-h-comment' into
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
M
erge
branch 'jg/cgu
i
d
e-we-cannot-count'
into m
a
i
n
t
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
M
erge branch '
j
k/pack-corrupti
o
n-post-mortem' into
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Juni
o
C Hamano
Merge
b
r
a
n
ch 'j
n
/
d
oc-fast
-
import-no
-
16-octopus-limit
.
.
.
commit
|
commitdiff
|
tree
2015-04-15
Junio C H
a
man
o
parse_d
a
te_basic
(
):
le
t
th
e
system handle DST conversion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-15
Junio C
Ha
m
ano
p
a
rse_date_
b
a
s
ic(): return early
w
h
e
n given a
b
ogus
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-02
Junio C Hama
n
o
push --signed: tig
h
ten what
t
he
rece
i
vi
n
g
e
nd can ask
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-31
Juni
o
C Hamano
G
i
t
2
.
3
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-31
Ju
n
i
o
C
Ham
a
no
Me
r
ge
branch 'ss/pul
l
-rebase
-
preserve' into maint
commit
|
commitdiff
|
tree
2015-03-31
Junio C Hamano
Merge branch 'jc/repor
t
-pat
h
-err
o
r-to
-
dir' into maint
commit
|
commitdiff
|
tree
2015-03-31
Junio C Hamano
Merge branch 'ph/push-do
c
-cas'
i
nto maint
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
Prepare for 2
.
3
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-28
Juni
o
C
H
ama
n
o
Merge br
a
nch 'sg/completion
-
gitcomp-nl-for
-
refs' int
o
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Junio C H
a
mano
M
e
rge branch
'
jk/si
m
p
lify
-
c
s
um-file-sha1f
d
-check
'
into
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
J
u
nio C H
a
mano
Merge bran
c
h
'tg/
t
est-index-
v
4'
into main
t
commit
|
commitdiff
|
tree
2015-03-28
Juni
o
C
Hamano
Me
r
ge b
r
anch 'nd/doc-git-
i
ndex-versio
n
' into main
t
commit
|
commitdiff
|
tree
2015-03-28
Ju
n
i
o
C Hamano
Mer
g
e
b
ra
n
ch 'ct/
p
rompt
-
untracked-fix' i
n
t
o maint
commit
|
commitdiff
|
tree
2015-03-28
J
u
nio C Hama
n
o
Merge branch 'ws
/
g
rep-quiet-n
o
-p
a
g
e
r
'
i
nto maint
commit
|
commitdiff
|
tree
2015-03-28
J
unio C Hamano
Merge branch
'jc/submitting-patches-mention-send-email
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Ju
n
io C Ha
m
ano
Merge branch 'jk/clea
n
up-failed-clone
'
into ma
i
nt
commit
|
commitdiff
|
tree
2015-03-28
Junio C
Ha
m
ano
Merge
b
ra
n
ch
'
jk/fet
c
h-pack'
into maint
commit
|
commitdiff
|
tree
2015-03-28
Jun
i
o C Hamano
Merge bran
c
h '
t
g/fix-ch
e
ck-o
r
d
e
r-with-split-inde
x
'
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Junio C
Hamano
Merge
branch 'jk/pr
u
ne-wit
h
-corrupt-refs' into maint
commit
|
commitdiff
|
tree
2015-03-27
Junio C Haman
o
Merge branch 'j
k
/ta
g
-h-
c
olumn-is-a-listing-
o
p
t
ion'
.
.
.
commit
|
commitdiff
|
tree
2015-03-27
Junio C Ham
a
no
Merge branc
h
'jk/s
m
ar
t
-http
-
hide-
r
e
f
s' into main
t
commit
|
commitdiff
|
tree
2015-03-27
Junio
C Hama
n
o
Merge
b
ranch 'js/com
p
letion-ctags-pattern-substitu
t
ion
.
.
.
commit
|
commitdiff
|
tree
2015-03-27
Junio C Ha
m
ano
Upd
a
te mailmap to spell
o
ut
"
Alexan
d
er Kuleshov"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-26
Junio
C Hamano
d
i
f
f
-
n
o-index
:
a
l
i
g
n D/F hand
l
ing with that of normal Git
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-26
J
u
n
io C Ha
m
ano
dif
f
-no-i
n
dex
:
DWIM "diff D F" int
o
"diff D/F F"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-24
Junio C Hamano
report_path_error(): move
to dir
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-23
Junio C Ha
m
ano
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 branch
'rs/use
-
isxdig
i
t' int
o
main
t
commit
|
commitdiff
|
tree
2015-03-23
Junio C Hamano
Merge bran
c
h 'rs
/
deflate-init-cleanup' into
m
aint
commit
|
commitdiff
|
tree
2015-03-23
Junio C Ha
m
ano
Merge branch 'a
k
/git-done-hel
p
-clean
u
p' i
n
to maint
commit
|
commitdiff
|
tree
2015-03-23
Juni
o
C Hamano
Merge bran
c
h 'sg/completion
-
remote' into maint
commit
|
commitdiff
|
tree
2015-03-23
Ju
n
io C Ha
m
an
o
M
e
rge bra
n
ch 'mg/do
c
-st
a
tus-color-slot'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2015-03-23
Junio C
Hama
n
o
Merge
b
ranch 'jc/
d
ecorate-leaky-sep
a
rator-
c
olor' into
.
.
.
commit
|
commitdiff
|
tree
2015-03-23
Jun
i
o C Hamano
Merge bra
n
c
h
'kn
/
git-
c
d-t
o
-empty'
i
nto maint
commit
|
commitdiff
|
tree
2015-03-23
Junio C Haman
o
Merge br
a
nch 'km/ima
p
-s
e
n
d-lib
c
ur
l
-options' into
maint
commit
|
commitdiff
|
tree
2015-03-23
Junio C Hama
n
o
Me
r
ge
b
ranch 'mg/
v
erify-commit' into
maint
commit
|
commitdiff
|
tree
2015-03-23
Junio C Hamano
Merge bran
c
h 'es/reba
s
e-i
-
count-todo
'
into
m
aint
commit
|
commitdiff
|
tree
2015-03-23
Junio C Hamano
Merge branch 't
b
/conn
e
ct-ipv6
-
parse-fix'
into ma
i
nt
commit
|
commitdiff
|
tree
2015-03-15
Ju
n
io
C
Hamano
SubmittingPatches
:
encourage use
r
s to use format
-
pa
t
ch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-14
Junio C Ham
a
no
Git
2
.
3
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-14
Junio C Hamano
Mer
g
e br
a
nch
'mr/doc-clean
-
f-f' into
ma
i
nt
commit
|
commitdiff
|
tree
2015-03-14
Junio C Hamano
Merge branc
h
'ak
/
t
5
516-typof
i
x' in
t
o
m
aint
commit
|
commitdiff
|
tree
2015-03-14
Junio C Hamano
Merge branch 'jc/diff-test-upd
a
tes' into maint
commit
|
commitdiff
|
tree
2015-03-14
J
unio
C
H
a
mano
Mer
g
e
branch 'jk
/
di
f
fcore-r
e
name-duplicate' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2015-03-14
Juni
o
C Hamano
M
erge branc
h
'bw/kwset-use
-
u
n
signed'
i
n
to maint
commit
|
commitdiff
|
tree
2015-03-14
J
unio C
Ha
m
a
n
o
Merge branch 'nd/gr
e
p-excl
u
de-stand
a
rd-help-fix'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2015-03-14
Junio C Hamano
Merge
b
ranc
h
'mg/doc-remote-tags
-
or-not' into
m
ain
t
commit
|
commitdiff
|
tree
next