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: replace strcpy with xsnprintf
2016-02-08
Jeff King
rerere:
r
eplace
strcp
y
with xsnp
r
int
f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Ham
a
no
rerere: un-n
e
st merg
e
() further
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hama
n
o
r
e
rer
e
: use "s
t
ruct rerere_id" ins
t
ead of "char *"
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C
H
am
a
no
rerere: ca
l
l conflict-id
s
IDs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Jun
i
o C
H
amano
rer
e
r
e: further
clari
f
y do_rerere_one_
p
ath()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio
C Hamano
re
r
ere: further
d
e
-dent do_p
l
ain_r
e
re
r
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hamano
rer
e
re: ref
a
ctor "
r
eplay"
part of do_plain_rere
r
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Juni
o
C
Hamano
rerere: explain the remaind
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hama
n
o
r
e
r
er
e
: expl
a
i
n
"
rere
r
e forge
t
" codepat
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
J
u
nio C
H
am
a
no
rerere:
e
xplai
n
the
p
ri
m
ary
c
o
depat
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Ha
m
an
o
rer
e
re: explain MERGE_RR management helpers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hamano
rere
r
e: fi
x
benign off-by-one non-bug
a
n
d
clari
f
y c
o
de
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Haman
o
r
erere: exp
l
ain
the r
e
rere
I/O abstraction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C
Hamano
r
ere
r
e: do not l
e
ak
m
mf
i
le[] for a
p
a
t
h with mul
t
i
ple
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hamano
rerere: stop looping unnecessarily
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Haman
o
rerere: drop wan
t
_sp p
a
rameter from is_cmarker()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Ju
n
io C Ha
m
ano
r
erere:
r
eport
a
u
t
oup
d
ated p
a
th
s
o
n
ly after actually
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Jun
i
o
C
Hamano
r
erere:
write o
u
t each recor
d
of
M
E
RGE_RR in o
n
e go
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Jun
i
o C Hamano
rerere: lift P
A
TH_M
A
X limitatio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hamano
r
e
r
ere: pl
u
g c
o
nflic
t
I
D
leaks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio
C
Hamano
rerere:
h
an
d
l
e confli
c
t
s
with multiple stage #1 entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-28
J
unio C
H
amano
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 Ham
a
no
G
it 2
.
3
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hama
n
o
Merge
br
a
n
ch '
m
m
/usage-log-
l
-can
-
take-regex
'
i
nto ma
i
nt-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
io
C Hama
n
o
Merge bran
c
h 'jc/diff-no-index-
d
-f' i
n
to
m
a
int-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o C Hamano
Merge b
r
anch 'oh/fix
-
confi
g
-de
f
ault-u
s
er
-
name-sect
i
on
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hama
n
o
Me
r
ge b
r
anch 'jc/epochtime-wo-t
z
' into maint-2
.
3
commit
|
commitdiff
|
tree
2015-04-27
Junio C Ha
m
ano
Git 2
.
3
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-27
J
unio C Haman
o
Mer
g
e b
r
anch 'tb/connec
t
-
i
pv6
-
pars
e
-f
i
x' i
n
to maint
commit
|
commitdiff
|
tree
2015-04-27
Junio C Ham
a
no
M
erge bran
c
h 'm
a
/
bash-completion-l
e
aki
n
g
-x'
i
nto maint
commit
|
commitdiff
|
tree
2015-04-27
Junio
C
Ham
a
no
Merge branch
'
j
c/push-
c
ert' into mai
n
t
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Git 2
.
3
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-21
Ju
n
io
C
Hamano
M
e
rge
branch 'jk/colors' int
o
maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Merge branch '
j
k/test-annoyan
c
es' into maint
commit
|
commitdiff
|
tree
2015-04-21
J
u
n
io C Hamano
Merge br
a
nch 'p
t
/enter-repo-commen
t
-fix' in
t
o maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C
Hamano
Merge branch '
j
z/git
w
eb-conf-doc-fix'
i
nto
maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
M
erge branch 'j
k
/che
r
ry-pick-
d
ocfix' int
o
maint
commit
|
commitdiff
|
tree
2015-04-21
Junio
C
H
a
mano
Merge br
a
nch 'iu/fi
x
-parse-opt
i
ons-
h
-c
o
mment' into
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
J
u
nio C Hamano
Merge bra
n
c
h
'
j
g
/
cgui
d
e-we-cannot-count'
i
n
to
ma
i
nt
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Merge
b
ranch '
j
k
/
p
a
ck-corrupti
o
n-post-mor
t
em' into
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Juni
o
C Hamano
Me
r
g
e branch 'jn/doc-fas
t
-
import-no
-
16-octo
p
us-lim
i
t
.
.
.
commit
|
commitdiff
|
tree
2015-04-20
Matthi
e
u Moy
log
-L:
improv
e
error
m
essage on malfor
m
ed arg
u
me
n
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
M
atthie
u
Mo
y
D
o
c
umentatio
n
: change -L:<r
e
gex>
to -L:<funcname
>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-17
O
s
si Herral
a
confi
g
: fix setti
n
gs
i
n default_user_con
f
i
g te
m
plate
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-15
Junio C Hamano
par
s
e_date_basic(): let the system h
a
ndle DS
T
c
o
n
version
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-15
J
unio C Hamano
p
a
r
s
e
_date_basic(): re
t
urn early when giv
e
n
a
b
o
gus
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-14
Julian Gindi
C
od
i
ngGuidelines: updat
e
'
r
oug
h
'
rule c
o
unt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-13
M
á
rcio Alm
a
da
completion: fix global bash vari
a
ble leak
o
n _
_
g
itco
m
p
a
ppend
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-09
Torste
n
Bögershau
s
en
connect
.
c: ignore extra
colon after hostname
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-04
Kyle
J
.
McKay
d
iff
-
highlight: do not split multibyte ch
a
ract
e
rs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-02
Junio C Hamano
push --sign
e
d:
t
ighten what the receivi
n
g end can ask
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-02
Jeff
K
ing
howto: document mo
r
e tool
s
for rec
o
very cor
r
uption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-01
J
o
natha
n
Nieder
fast-imp
o
r
t
d
o
c
: remove sugg
e
sted 16-p
a
rent limit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-31
Ju
n
io C Ha
m
an
o
G
i
t 2
.
3
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-31
Junio C
H
amano
Me
r
ge br
a
nch 'ss/p
u
ll-r
e
base-preserve' into maint
commit
|
commitdiff
|
tree
2015-03-31
Juni
o
C Hamano
M
e
rge branch
'
jc/r
e
po
r
t-path-error-to-dir' into
m
aint
commit
|
commitdiff
|
tree
2015-03-31
Juni
o
C Hama
n
o
Merge branc
h
'
p
h/pu
s
h-doc
-
c
as' in
t
o maint
commit
|
commitdiff
|
tree
2015-03-31
J
é
r
ô
me
Z
ago
gitweb
.
c
o
nf
.
txt: s
a
y
"bu
i
ld-time", not
"built
-
ti
m
e"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-31
Pa
u
l
T
a
n
enter_repo(): fix docs to mat
c
h code
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-31
Jeff King
che
r
r
y-pick: fix docs describing handling of e
m
pty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-30
Sebastian Schuberth
docs: clarify what g
i
t-reb
a
se's "-p" / "--pres
e
rv
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-30
Ivan
U
khov
p
a
r
s
e
-options
.
h: OPTION
_
{BI
T
,SET_I
N
T}
d
o not store
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-28
Junio C H
a
mano
Prepare
f
or 2
.
3
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-28
Jun
i
o C Hama
n
o
Me
r
ge branch 'sg/c
o
m
p
letion
-
gitcomp-nl-for-refs' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Junio C H
a
mano
Merge branch 'jk/sim
p
lify-csum-file-sha1fd-check' int
o
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
Merge bra
n
ch
'
tg/test-
i
nde
x
-
v4' in
t
o
mai
n
t
commit
|
commitdiff
|
tree
2015-03-28
Junio
C Hamano
Merge bran
c
h
'n
d
/doc-git-index-version' into maint
commit
|
commitdiff
|
tree
2015-03-28
Junio
C
H
a
man
o
M
erge branch 'ct
/
p
ro
m
pt-untracked-fix' i
n
to maint
commit
|
commitdiff
|
tree
2015-03-28
Junio C Ham
a
no
Merge
branch 'ws/
g
rep-qu
i
et-n
o
-p
a
ger' into maint
commit
|
commitdiff
|
tree
2015-03-28
Junio C Ha
m
ano
Merge
branch 'jc/sub
m
itt
i
ng-pat
c
hes-m
e
n
t
ion-s
e
nd-em
a
il
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Junio C Ham
a
no
Merge
b
ran
c
h 'jk
/
c
leanup
-
failed
-
c
l
one' in
t
o
maint
commit
|
commitdiff
|
tree
2015-03-28
Juni
o
C Ham
a
no
Merg
e
branc
h
'jk/fetch-pack'
i
nto
m
ai
n
t
commit
|
commitdiff
|
tree
2015-03-28
Junio
C Hamano
Merg
e
branch 'tg/fix-check-order-with-split-inde
x
'
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Junio C
H
amano
M
erge bra
n
ch 'jk/prune-with-corrupt-refs'
int
o
maint
commit
|
commitdiff
|
tree
2015-03-28
T
homas
Ackermann
2
.
3
.
2 re
l
e
ase notes: typofi
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-27
J
u
n
io
C Hamano
Merge bra
n
ch
'jk/tag-h-
c
olumn-
i
s-a-listing-option'
.
.
.
commit
|
commitdiff
|
tree
2015-03-27
Junio C Hamano
Me
r
ge branch 'jk/smart-http-
h
ide-ref
s
'
into maint
commit
|
commitdiff
|
tree
2015-03-27
J
un
i
o C
Hamano
Me
r
ge branch 'js/complet
i
on-ctags-pattern-sub
s
ti
t
u
t
i
on
.
.
.
commit
|
commitdiff
|
tree
2015-03-27
Junio C Hamano
U
pd
a
te mailmap to sp
e
ll out "Alexander
K
uleshov
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-26
Junio C Hamano
diff-no-index: ali
g
n
D/
F
handlin
g
wi
t
h that of normal Git
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-26
Sebastian Schub
e
rth
d
o
cs: clarify "preserve" option
w
o
r
ding for git-pull
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-26
Phil H
o
rd
git-push
.
txt
:
clean u
p
f
orce-with-lease
wordi
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-26
Junio C
Hamano
diff-no-in
d
ex: DWI
M
"diff
D
F" in
t
o
"
dif
f
D/F F"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-24
Junio C
Hamano
r
e
port_path_erro
r
(): mov
e
to
d
ir
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-24
N
guyễn Thái Ngọc Duy
git
.
t
x
t: list index versions in plain English
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-23
Juni
o
C Hamano
Git
2
.
3
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-23
Ju
n
io C Hamano
Mer
g
e branch
'
r
s
/use-isxdigit' into m
a
int
commit
|
commitdiff
|
tree
2015-03-23
J
u
nio C H
a
mano
Merg
e
branch
'
rs
/
de
f
late-init-
c
lean
u
p'
i
n
to m
a
int
commit
|
commitdiff
|
tree
2015-03-23
Ju
n
io C Hamano
Mer
g
e branch 'ak/git
-
done
-
help-c
l
eanup' into
maint
commit
|
commitdiff
|
tree
2015-03-23
Ju
n
io C Hamano
Merge branch 'sg/
c
o
m
pletion-remote' into maint
commit
|
commitdiff
|
tree
2015-03-23
Junio C Ham
a
no
M
erge branch 'mg/
d
oc-status-colo
r
-slot' in
t
o maint
commit
|
commitdiff
|
tree
2015-03-23
Junio C
Hamano
Merge
b
r
anch 'jc/decorate-leaky-separator-colo
r
'
into
.
.
.
commit
|
commitdiff
|
tree
2015-03-23
Junio
C Hamano
Merge branch
'
k
n/git
-
cd-to-
e
mpty'
i
nt
o
maint
commit
|
commitdiff
|
tree
2015-03-23
Junio C
H
aman
o
Merge
b
ranch 'km/imap-send
-
libcurl-optio
n
s'
i
n
t
o maint
commit
|
commitdiff
|
tree
2015-03-23
Junio C Ha
m
ano
Me
r
ge branch 'mg/verify-commit' into maint
commit
|
commitdiff
|
tree
2015-03-23
J
unio C Hamano
Merge branch 'es/reb
a
se-i-coun
t
-
todo' into maint
commit
|
commitdiff
|
tree
2015-03-23
Juni
o
C Ham
a
no
Merge branch 'tb/c
o
nnect-ipv6-p
a
rse-fix' into
m
aint
commit
|
commitdiff
|
tree
2015-03-22
SZ
E
DER Gábor
completion:
u
se __gitcomp
_
nl
(
)
f
or completing re
f
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-20
Thomas Gummerer
read-c
a
che: fix reading o
f
sp
l
it index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-20
Jeff King
r
e
f
s
.
c: drop curate_pa
c
ked_r
e
fs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next