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
rerere: rem
o
ve
a
n null statem
e
nt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-05-11
Junio C Ha
m
ano
rere
r
e: p
l
ug memory lea
k
s upon
"rer
e
re f
o
rge
t
" failure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-06
Junio C
H
a
mano
rere
r
e: adjust 'for
g
et' to m
u
lt
i
-varia
n
t
world
order
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-06
Junio C Haman
o
rerere:
s
plit
code to call ll_merge(
)
further
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-06
Jun
i
o C Hamano
rerere
:
move
code rel
a
te
d
to "
f
orget" together
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-06
Junio C Hamano
rerere: gc an
d
clear
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-15
Junio C Hamano
r
ere
r
e: do use mult
i
ple
variants
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-15
Junio C Hamano
t4200:
r
ere
r
e
a
m
er
g
e with two
identical co
n
flicts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-15
J
u
nio C Hamano
r
e
rere: allow mul
t
iple variants
to e
x
i
s
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-15
Juni
o
C
H
am
a
no
re
r
ere: delay t
h
e recording
o
f preimage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-15
J
u
n
i
o C Hamano
rerer
e
: handle leftov
e
r rr-
c
ache/$
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: scan $GIT_
D
IR/
r
r-
c
ac
h
e/$ID when
instanti
a
tin
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-02-08
Junio C Ha
m
ano
rerere: sp
l
it
confl
i
ct ID further
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-02-08
Jeff King
rerere: repl
a
ce strcpy with xsnprintf
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hamano
rerere: un-nest merge()
f
urther
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
J
u
n
io C Hamano
r
e
rere
:
use "struct rerere_id" instead of "char *"
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Ha
m
ano
r
e
rere: call conflict-i
d
s
I
Ds
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Ham
a
n
o
rerere: further clarify d
o
_rerere_one_path()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hama
n
o
rerere: furt
h
er de-dent do_plain
_
rerere()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hamano
rerere: refactor "replay" part of do_plain_rerere()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Ju
n
io
C Ha
m
ano
rerere: explain the remainder
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Ha
m
ano
r
e
rere: exp
l
ain "rere
r
e
forg
e
t"
c
odepath
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
J
unio C
Hamano
r
e
r
e
re: explain the
p
r
i
m
ary codep
a
th
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hamano
rerere: explain MERGE_RR m
a
nagem
e
nt helpers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Juni
o
C
H
a
m
a
no
rer
e
re: fix
b
enign off
-
by-one
n
on
-
bug
and clarify code
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hamano
re
r
ere
:
ex
p
lai
n
the rerere I/O abstract
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Haman
o
r
e
rere
:
do not leak mmf
i
le[] for a path wi
t
h multiple
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Juni
o
C Hamano
rerere:
stop l
o
oping unnecess
a
rily
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hamano
rer
e
re:
drop want_sp parameter
fr
o
m
i
s_cmarker()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C H
a
man
o
r
erere: re
p
o
rt autoupdated paths only afte
r
actu
a
l
l
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
J
u
nio C Hama
n
o
rerere: write out eac
h
record of MERGE_RR in one g
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hamano
re
r
ere: lift PATH_MAX lim
i
t
ation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hamano
rerere: plug conflict
I
D leaks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
J
u
nio C H
a
mano
rerere: handle conf
l
icts with multiple stage #1
e
ntries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-28
Junio C
Ham
a
no
rerere: fix a
n
off-
b
y-one non-bug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C Hamano
Git 2
.
3
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-11
Junio C
Hamano
Merge branch
'
mm/u
s
a
g
e-log-
l
-can-t
a
ke-regex'
i
nto maint-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge b
r
anch '
j
c/diff-no
-
index-
d
-
f
' into maint-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
H
a
mano
Merge branch 'oh/fix-confi
g
-default-
u
ser-name-section
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
J
unio C
Hamano
M
erge branch 'jc/epochtime-
w
o-tz' into ma
i
n
t-2
.
3
commit
|
commitdiff
|
tree
2015-04-27
Junio
C Hamano
Git 2
.
3
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-27
Junio
C Hamano
Merge branch '
t
b/connect-ipv6-p
a
rse-fix
'
into maint
commit
|
commitdiff
|
tree
2015-04-27
Junio C
Hamano
Merge bran
c
h 'ma
/
bash-c
o
mpletion
-
lea
k
ing-x
'
into maint
commit
|
commitdiff
|
tree
2015-04-27
J
u
n
io
C
Ha
m
ano
Merge b
r
anch
'jc/pu
s
h-cert' into maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
G
it 2
.
3
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Mer
g
e
branch 'jk/co
l
ors' into maint
commit
|
commitdiff
|
tree
2015-04-21
J
u
n
io C H
a
mano
Merge branch 'jk/
t
es
t
-annoy
a
nces' int
o
maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C H
a
mano
Merg
e
branch 'pt/e
n
ter-repo-
c
omment-f
i
x' into m
a
int
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Merge bra
n
ch 'jz/git
w
eb-conf-doc-f
i
x' into maint
commit
|
commitdiff
|
tree
2015-04-21
Jun
i
o C Hama
n
o
M
e
rge branch 'jk/cherry-pic
k
-
do
c
fix' into
maint
commit
|
commitdiff
|
tree
2015-04-21
Ju
n
io C Ham
a
no
M
e
rge b
r
anch 'iu/fix-parse-options-h-commen
t
' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
J
unio C Hamano
M
e
r
ge
branch
'
j
g/cg
u
i
de-we-cannot-c
o
unt'
i
n
to maint
commit
|
commitdiff
|
tree
2015-04-21
J
unio C Hamano
Merge branch 'jk/pack-corru
p
tion-post-mor
t
em'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Junio C
H
amano
Merg
e
branch
'
jn/doc-fas
t
-impor
t
-no-16-octopus-l
i
m
i
t
.
.
.
commit
|
commitdiff
|
tree
2015-04-20
Matthieu Moy
lo
g
-L: im
p
ro
v
e
erro
r
messa
g
e on malformed argument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
Matthieu Moy
D
oc
u
menta
t
ion: change -
L
:
<
regex> to -L:<funcname>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-17
Ossi He
r
rala
confi
g
: fix s
e
ttings in d
e
fault_user_config template
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-15
Junio C
H
ama
n
o
pa
r
se_date_basic(): let the syste
m
h
a
ndle
D
ST co
n
version
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-15
Junio
C Hamano
p
a
r
s
e
_date_b
a
sic(): retur
n
early whe
n
giv
e
n a bogus
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-14
Julian Gindi
CodingGuidelines: upd
a
te 'rough' rule co
u
nt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-13
Márcio
Almada
completion: fix global b
a
sh
v
ar
i
able leak on __gi
t
compappen
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-09
Torsten Bögershausen
c
o
n
n
ect
.
c: igno
r
e
e
x
t
ra colo
n
after
hostname
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-04
Kyle J
.
McKay
diff-highligh
t
: do not split mul
t
ibyte characte
r
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-02
Junio
C Hamano
p
ush --
s
igned: tight
e
n wh
a
t
the receiving en
d
c
an ask
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-02
Jeff King
howto: docu
m
en
t
m
o
re
t
o
o
ls for rec
o
very
corruption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-01
Jonathan Nie
d
er
f
ast-import do
c
: r
e
move suggested
1
6-parent limit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-31
Junio C Hamano
Git
2
.
3
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-31
Junio
C Hamano
M
e
rge
b
ranch 'ss/pull-reb
a
se-preser
v
e' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2015-03-31
Junio C Hamano
Merge
br
a
nch 'j
c
/rep
o
rt-path-er
r
or-to-d
i
r' into maint
commit
|
commitdiff
|
tree
2015-03-31
Junio
C
Hamano
Me
r
ge b
r
anch 'ph/push-doc-cas' into maint
commit
|
commitdiff
|
tree
2015-03-31
J
é
rôme Zago
git
w
eb
.
conf
.
txt
:
say "buil
d
-tim
e
", not "built-time"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-31
P
au
l
Tan
enter_repo(): fix docs to m
a
tc
h
code
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-31
Jeff King
c
h
erry-pick: fix
d
ocs de
s
cr
i
bing handling of e
m
pty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-30
Sebas
t
ia
n
Schuber
t
h
d
o
cs: clarify what
g
it-rebase's
"-p" / "--preserve
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-30
Iv
a
n Ukhov
p
a
rse-options
.
h:
OPT
I
ON_{BIT,SET_INT} do no
t
store
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-28
Junio C
H
amano
Prepare for 2
.
3
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-28
Junio C
H
a
mano
Merge branch 'sg/c
o
m
pletion-gitcomp-
n
l-
f
or-refs'
into
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
M
e
r
g
e bra
n
ch 'jk/simplify-
c
sum-
f
ile
-
sha
1
fd-che
c
k' into
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Junio C
Hamano
Merge b
r
anch
'
tg/test-index-v4'
i
nto
m
aint
commit
|
commitdiff
|
tree
2015-03-28
Ju
n
io C Hamano
M
erge branch 'nd/doc-git-index
-
version
'
into maint
commit
|
commitdiff
|
tree
2015-03-28
J
u
nio C Hamano
Merge branch 'ct/prompt-untracked-
f
ix' i
n
to
maint
commit
|
commitdiff
|
tree
2015-03-28
Junio C Ham
a
n
o
Merge branch 'ws/grep-qu
i
et-no-pager
'
i
n
to maint
commit
|
commitdiff
|
tree
2015-03-28
Junio C Ha
m
ano
Merge branch 'jc/submitting-patches-mention
-
se
n
d-email
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Juni
o
C Ham
a
no
Merge branch
'jk/clea
n
up-fa
i
led-c
l
o
n
e' into ma
i
nt
commit
|
commitdiff
|
tree
2015-03-28
Juni
o
C
Ha
m
a
no
Merge
b
ranch 'jk/fetch-pac
k
' into mai
n
t
commit
|
commitdiff
|
tree
2015-03-28
J
u
nio C Hamano
Merge branch 'tg/fix-c
h
ec
k
-order-with
-
split-index'
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
M
erge b
r
anch 'jk
/
pru
n
e
-
wi
t
h-corrupt-refs' into main
t
commit
|
commitdiff
|
tree
2015-03-28
Thomas Ackermann
2
.
3
.
2 r
e
lease notes:
typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-27
J
u
nio C H
a
mano
Merg
e
branc
h
'jk/tag-h-co
l
umn-i
s
-a-listing-
o
ption'
.
.
.
commit
|
commitdiff
|
tree
2015-03-27
J
u
nio
C Haman
o
Merg
e
branch '
j
k/smart-h
t
tp-hide
-
refs'
into maint
commit
|
commitdiff
|
tree
2015-03-27
Junio C
H
a
mano
Me
r
g
e
branch 'js/compl
e
tion-cta
g
s-
p
a
t
t
ern-substitution
.
.
.
commit
|
commitdiff
|
tree
2015-03-27
Juni
o
C Hamano
Updat
e
mail
m
ap to spell out "Alexander Kulesh
o
v"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-26
Juni
o
C Haman
o
diff
-
no
-
index: al
i
gn
D
/
F
handl
i
n
g
with that of normal Git
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-26
Sebastia
n
Schuberth
docs: cl
a
rify "pr
e
serve" option wording for git-pul
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-26
P
hil H
o
r
d
git-push
.
txt: clean up
force-with-lease wording
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-26
Junio C Hamano
diff-no-inde
x
: DW
I
M "diff D
F" into "diff D/F F"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-24
J
u
nio
C
Hamano
report_
p
at
h
_error(
)
:
m
o
ve to dir
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-24
Nguyễn Th
á
i Ngọc Duy
git
.
txt: list index ver
s
ions in
p
la
i
n English
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-23
Junio C Ham
a
n
o
Git 2
.
3
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-23
Ju
n
io C Hamano
Merge branch 'rs/use-isxdigit' in
t
o maint
commit
|
commitdiff
|
tree
next