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
J
e
ff King
r
erere: rep
l
ace strcpy
w
ith
xsnprin
t
f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
J
unio C Hamano
rere
r
e: un-n
e
st m
e
rge() f
u
rther
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Ha
m
a
no
rer
e
re: use "struct rer
e
re_id" in
s
t
ead
o
f "char *"
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hamano
rer
e
re: call conflict-i
d
s IDs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
J
u
nio C Hamano
rerere: fur
t
her clarify d
o
_rerere_one
_
p
a
t
h
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
J
u
nio
C Hamano
rerere: further de-dent do_plain_rerere()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Jun
i
o C Hamano
re
r
ere: refacto
r
"repl
a
y
"
part of do_plai
n
_
rer
e
re()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Ju
n
io
C
Hamano
rerere: explain the remainde
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Haman
o
rerere: explain "r
e
r
ere forget" codepath
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Jun
i
o
C Hama
n
o
rerere: ex
p
l
a
i
n the
p
rimary co
d
epa
t
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Junio C H
a
mano
r
e
r
e
re: expl
a
i
n MERGE_RR management helpers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Junio C
Ham
a
no
r
e
rere: fix benign off-by-o
n
e
no
n
-
b
ug a
n
d clari
f
y code
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hamano
r
erere: explain
t
he rerere I/O abstraction
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hamano
rerer
e
: do no
t
l
e
ak mmfi
l
e[] for a p
a
th with m
u
ltiple
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
J
u
nio
C
Hamano
rerere
:
stop looping
u
nnecessarily
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Junio
C
Hamano
rerere
:
drop
w
ant_sp
pa
r
amet
e
r from is_cmarker()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hamano
r
erere: re
p
o
r
t autoupdated paths
only after
ac
t
u
all
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Juni
o
C
Hamano
r
e
rere
:
write o
u
t each r
e
cord of
M
ER
G
E_RR i
n
one g
o
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hamano
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 Ha
m
ano
rerere: plug conflict ID leaks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
J
u
n
io C Hamano
rerere: handl
e
c
o
nflicts wit
h
multiple sta
g
e #1
e
ntries
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-one no
n
-
bug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Gi
t
2
.
3
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branc
h
'
mm/usage-lo
g
-l-can-take-regex
'
i
n
to ma
i
n
t
-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C
Hamano
Merge br
a
nc
h
'jc/d
i
ff-no-index-d-f
'
i
n
t
o
maint-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'oh/fix-config-defau
l
t-user-name-section
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C Hama
n
o
Me
r
ge branch 'jc/epochtime-wo-tz' into maint-
2
.
3
commit
|
commitdiff
|
tree
2015-04-27
Ju
n
io C
H
amano
Git 2
.
3
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-27
Ju
n
io C Hamano
Mer
g
e branch 'tb/connect-ipv6-p
a
rse-
f
ix
'
into
m
a
i
n
t
commit
|
commitdiff
|
tree
2015-04-27
Jun
i
o C
H
ama
n
o
Merge b
r
anch 'ma/bash-completion-lea
k
ing-x' int
o
m
aint
commit
|
commitdiff
|
tree
2015-04-27
Junio C Hamano
Merge branch 'jc/push-cert' into m
a
int
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
J
u
nio C
Ham
a
no
Merge bra
n
ch
'
jk/
c
olors'
i
nto maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C Haman
o
Me
r
ge branch 'jk/test-annoyances' into maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C H
a
mano
Merge branch 'pt/enter-
r
epo-c
o
mment
-
fix
'
into
m
ain
t
commit
|
commitdiff
|
tree
2015-04-21
J
u
ni
o
C Hamano
Merge branch 'jz/gitweb-conf-doc-fix' int
o
maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Merge
b
ranch 'jk/cherry-p
i
ck-docf
i
x'
into maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C
H
amano
Merge
b
ra
n
ch
'
i
u
/fix-
p
a
r
se-options-h-comm
e
nt'
into
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
J
u
n
i
o
C Hamano
Merge
b
ranch 'jg/
c
guide-we-cannot-
c
ount' i
n
to maint
commit
|
commitdiff
|
tree
2015-04-21
Junio
C H
a
mano
Merge bran
c
h 'jk/pack-corruption
-
po
s
t-mortem' into
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Junio C
Ham
a
n
o
Merge branch 'jn/doc-fast-import-no-16-oc
t
opus-limit
.
.
.
commit
|
commitdiff
|
tree
2015-04-20
Matth
i
eu Moy
log
-
L: impro
v
e
error message on malformed argument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-20
M
a
tthieu Moy
Documen
t
atio
n
:
c
ha
n
g
e
-L:<re
g
ex> to -L:
<
f
u
nc
n
a
me>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-17
Ossi Herr
a
la
config: fix settings in d
e
fau
l
t
_
us
e
r_config template
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-15
J
u
n
io
C
Hamano
parse_date_basic
(
)
:
let the system
h
a
ndle DST convers
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-15
Junio C Hamano
par
s
e_date_basic(): return early when given a bogus
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-14
Julian Gindi
CodingGuidelines: upda
t
e 'r
o
u
g
h' rule
c
o
unt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-13
Márci
o
A
lmada
co
m
plet
i
on: fix global bash variable leak on
__gitcompappend
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-09
Tor
s
ten
B
ögershaus
e
n
connect
.
c:
ignore extr
a
c
olon a
f
ter hostname
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-04
K
y
le J
.
M
cKay
diff-highlight: do not
split multiby
t
e chara
c
ter
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-02
Junio C Hamano
p
u
sh
-
-s
i
gn
e
d: ti
g
hten what the receiving end
c
an
a
sk
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-02
Jeff King
h
o
w
t
o: document more
t
oo
l
s for
r
ecovery corruption
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-01
Jonath
a
n Nieder
fast-import d
o
c: remov
e
suggested 16-parent limit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-31
Junio C H
a
mano
Git
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 branch
'
ss/pu
l
l-rebase-p
r
eserve' into maint
commit
|
commitdiff
|
tree
2015-03-31
Junio C Hama
n
o
Merge branc
h
'jc/report-path-error
-
to-dir'
i
nto ma
i
n
t
commit
|
commitdiff
|
tree
2015-03-31
Junio C Hamano
M
e
r
g
e branch
'ph/pus
h
-doc-cas' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2015-03-31
Jérôme Z
a
go
git
w
eb
.
conf
.
t
x
t: s
a
y "
b
uild-time", not "b
u
il
t
-time"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-31
Paul Tan
enter_repo(): fix
d
ocs to match co
d
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-31
Jeff King
ch
e
rry-pick: fix docs describing handlin
g
of empty
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-30
Se
b
ast
i
an Schuberth
docs: clarify wha
t
gi
t
-rebase's "-p" / "--
p
r
e
serve
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-30
Ivan
U
khov
parse-opt
i
o
ns
.
h:
OPTIO
N
_{BIT
,
S
E
T_I
N
T} do not store
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-28
Junio C Ham
a
no
Prepare for
2
.
3
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
Merge
b
ranch
'sg/co
m
pletio
n
-gitc
o
mp-n
l
-fo
r
-refs'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hama
n
o
Merge branch 'jk/simplif
y
-csum-fi
l
e
-
s
ha1fd-check' into
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hama
n
o
Merge
branch 'tg/test-
i
ndex-
v
4' i
n
to maint
commit
|
commitdiff
|
tree
2015-03-28
Junio C Ha
m
ano
M
e
rg
e
branch
'
nd/doc-git-index-versi
o
n' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
Merge branc
h
'ct
/
pr
o
m
pt-untracked-fix'
into maint
commit
|
commitdiff
|
tree
2015-03-28
J
unio C Haman
o
Merge branch 'ws
/
grep
-
qu
i
et-n
o
-pager'
i
nto maint
commit
|
commitdiff
|
tree
2015-03-28
Ju
n
io C Hamano
M
e
rge br
a
nch
'
jc/s
u
bmitt
i
n
g
-patches-mention-send-email
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Jun
i
o
C H
a
mano
Merg
e
br
a
nch 'jk/clea
n
up-failed-clone'
i
nto maint
commit
|
commitdiff
|
tree
2015-03-28
Ju
n
i
o
C Ham
a
no
Merge branch 'jk/fe
t
ch-
p
ack' into mai
n
t
commit
|
commitdiff
|
tree
2015-03-28
Junio C Haman
o
Merge b
r
anc
h
'tg/fix-check-order-w
i
th-split
-
in
d
ex'
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
Merge bra
n
ch 'jk/prune-with-c
o
r
r
u
pt-
r
efs' into ma
i
nt
commit
|
commitdiff
|
tree
2015-03-28
Thomas Ackermann
2
.
3
.
2 rel
e
ase not
e
s: typofix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-27
Junio
C Hamano
Merge branch 'jk/tag-h-column-is
-
a-listing-op
t
io
n
'
.
.
.
commit
|
commitdiff
|
tree
2015-03-27
Junio
C
H
amano
Merge branch 'jk/smar
t
-http-hide-refs
'
into maint
commit
|
commitdiff
|
tree
2015-03-27
Jun
i
o
C Ham
a
no
Merg
e
branc
h
'
j
s/completion-ctags
-
pattern-substitutio
n
.
.
.
commit
|
commitdiff
|
tree
2015-03-27
Junio C Hamano
Update mailmap t
o
s
p
ell 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: align D/F handling with
t
hat of norm
a
l Git
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-26
Sebastian Schubert
h
docs: clarify "preserve" option
wordin
g
fo
r
git-pull
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-26
Phil Hord
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
Ha
m
a
no
diff-no-index: DWIM
"
dif
f
D
F" into "dif
f
D/F F"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-24
J
u
n
i
o
C Hamano
repo
r
t
_path_error(): mov
e
to dir
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-24
Nguyễ
n
T
hái Ngọc D
u
y
g
it
.
txt: lis
t
index vers
i
ons i
n
plain English
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-23
J
unio C Haman
o
G
it 2
.
3
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-23
Junio C Ha
m
ano
M
erge br
a
nch '
r
s/u
s
e-isxdigit' in
t
o
maint
commit
|
commitdiff
|
tree
2015-03-23
Junio C Hamano
M
e
rge b
r
anc
h
'rs/d
e
fla
t
e-ini
t
-c
l
eanup'
i
nto
m
a
i
n
t
commit
|
commitdiff
|
tree
2015-03-23
Junio C H
a
mano
M
erge bra
n
ch 'ak/git-done-
h
elp-clean
u
p' into mai
n
t
commit
|
commitdiff
|
tree
2015-03-23
Juni
o
C
H
a
m
ano
Merge
bran
c
h
'
sg/completion-re
m
ote' i
n
to m
a
i
nt
commit
|
commitdiff
|
tree
2015-03-23
Jun
i
o C
H
amano
Me
r
ge
branch 'mg/doc-stat
u
s-col
o
r
-
slot'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2015-03-23
J
u
nio
C
Hamano
Merge branch 'jc
/
decorate-leaky-se
p
arator-co
l
o
r' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-03-23
J
unio C Hamano
Merge
b
r
anc
h
'kn/gi
t
-cd-
t
o-emp
t
y' into maint
commit
|
commitdiff
|
tree
2015-03-23
Ju
n
io C Hama
n
o
Merge branch
'km/ima
p
-send-libcurl-options' into m
a
int
commit
|
commitdiff
|
tree
2015-03-23
Junio C
H
amano
M
e
r
g
e
branc
h
'mg/verify-commit'
i
nto maint
commit
|
commitdiff
|
tree
2015-03-23
Junio C Hama
n
o
M
erge branch 'es/re
b
ase-i-count-to
d
o'
i
nt
o
m
a
int
commit
|
commitdiff
|
tree
2015-03-23
Junio
C Haman
o
Merge branch 'tb/con
n
ect-ipv6-pars
e
-fix' into m
a
in
t
commit
|
commitdiff
|
tree
2015-03-22
SZEDER Gábor
compl
e
tion: us
e
__gitc
o
mp_nl() for completing refs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-20
T
homas
Gummerer
r
e
ad-ca
c
he
:
fix r
e
ading
o
f
split ind
e
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-20
Jef
f
King
refs
.
c:
d
r
o
p curate_p
a
cked_r
e
fs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next