repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge: teach -Xours/-Xtheirs to symbolic link merge
2018-01-03
J
u
n
io C
Hamano
me
r
ge: teach -X
o
u
r
s
/
-Xthei
r
s t
o
sym
b
olic link merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-09-10
Junio
C
H
aman
o
RelNotes: further
fixe
s
for 2
.
14
.
2 from the
mast
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-09-10
Junio C Ha
m
ano
Merge branc
h
'
jt/doc-pack-o
b
jects-fix' into maint
commit
|
commitdiff
|
tree
2017-09-10
J
u
nio C Hamano
Merge
branch '
j
n/vcs-
s
vn-cle
a
n
u
p' into ma
i
n
t
commit
|
commitdiff
|
tree
2017-09-10
Juni
o
C Hamano
Merge branch 'bc/v
c
s-svn
-
cleanup' into ma
i
n
t
commit
|
commitdiff
|
tree
2017-09-10
Ju
n
io C
H
amano
Merge branc
h
'
jk/doc-th
e
-
this' i
n
to maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
Merge br
a
nch 'rs/commit-h-single-parent-cleanu
p
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2017-09-10
J
u
ni
o
C Ha
m
ano
Merge branch 'mg/format-r
e
f
-d
o
c-fix' into ma
i
nt
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
Merge bran
c
h
'sb/submodule-para
l
l
el-update
'
in
t
o maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hama
n
o
Merge
b
r
a
n
ch
'
h
v/t5526-a
n
dand-c
h
ain-
f
ix' into
m
aint
commit
|
commitdiff
|
tree
2017-09-10
Junio C H
a
mano
Mer
g
e branch 'sb/sha1-fi
l
e-cleanup' into maint
commit
|
commitdiff
|
tree
2017-09-10
Junio
C Hamano
Merg
e
branc
h
'rs/t1002
-
do-
n
ot-use-sum' into
m
aint
commit
|
commitdiff
|
tree
2017-09-10
Juni
o
C Ham
a
no
M
e
r
ge branch 'ah
/
doc-empty-
s
t
r
i
n
g-i
s
-false' in
t
o maint
commit
|
commitdiff
|
tree
2017-09-10
Juni
o
C
Hamano
Merge branch 'rs/merge-microcleanup' into maint
commit
|
commitdiff
|
tree
2017-09-10
J
u
n
io
C
H
amano
M
e
rge br
a
nch 'rs/find-pack-entry-bisect
i
on' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
Merge branch 'r
s
/
apply-lose-prefix-length' i
n
to maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
Me
r
ge bra
n
ch '
r
j/add-chmod-error-messa
g
e' into maint
commit
|
commitdiff
|
tree
2017-09-10
J
unio
C
Hamano
M
erg
e
bra
n
ch 'j
k
/hashcmp-memcmp' into maint
commit
|
commitdiff
|
tree
2017-09-10
Juni
o
C
Hamano
Merge branch 'rs/t3700-cle
a
n-leftover' into ma
i
nt
commit
|
commitdiff
|
tree
2017-09-10
Ju
n
io
C
Hama
n
o
M
e
rge branch 'jc/
p
e
r
l
-
git-comment-typof
i
x'
into ma
i
nt
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
Merg
e
branch 'mf/n
o
-
dashed-subcom
m
ands'
into maint
commit
|
commitdiff
|
tree
2017-09-10
J
u
nio C Hamano
Merge
branch
'
a
b/ref-fil
t
er-no
-
c
o
nta
i
ns' in
t
o m
a
int
commit
|
commitdiff
|
tree
2017-09-10
Junio
C
Ham
a
no
Merge branch 'rs/
a
rchive-exclu
d
ed-
d
ir
e
c
tory
'
into main
t
commit
|
commitdiff
|
tree
2017-09-10
J
unio C Hamano
Merge branch 'mg
/
k
il
l
ed-merge'
i
nto maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C Ha
m
ano
Merge bran
c
h '
t
b
/appl
y
-
w
ith-crl
f
' in
t
o
mai
n
t
commit
|
commitdiff
|
tree
2017-09-10
Juni
o
C Ha
m
ano
M
e
r
g
e
branch 'cc/
s
u
bprocess-
h
an
d
s
hake
-
missing-ca
p
abilities
.
.
.
commit
|
commitdiff
|
tree
2017-09-10
Ju
n
io C Hamano
Merge bra
n
ch 'a
s
/grep-quiet-no-ma
t
c
h
-exit-cod
e
-fi
x
.
.
.
commit
|
commitdiff
|
tree
2017-09-10
J
u
nio C
Hamano
Merge branch 'kd/st
a
sh-w
i
th-bash-4
.
4' into maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
Merge
b
r
a
nch 'rs
/
win32-
s
yslog-leakfix' into
m
ain
t
commit
|
commitdiff
|
tree
2017-09-10
Junio C
Ham
a
no
Merge bran
c
h 'rs
/
unp
a
ck-en
t
ry-leakfix' into maint
commit
|
commitdiff
|
tree
2017-09-10
Ju
n
i
o C
Hamano
Me
r
ge branch 'rs/fsck-obj-lea
k
fix' in
t
o maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C Ham
a
n
o
Merge
branch 'ur/
s
v
n
-loc
a
l-zone'
i
nto maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C
H
amano
Mer
g
e branch '
p
w/am-sign
o
ff' in
t
o
mai
n
t
commit
|
commitdiff
|
tree
2017-09-10
J
u
ni
o
C Hamano
Me
r
g
e
branch 'rs/in-obsd-basenam
e
-
dirn
a
me-tak
e
-
const
.
.
.
commit
|
commitdiff
|
tree
2017-09-10
Junio C Ha
m
a
n
o
Merge bran
c
h 'rs/t
4
062
-
obsd' into maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C H
a
m
ano
Merge
b
r
a
nch 'rs/obsd-ge
t
cwd-workaround' into maint
commit
|
commitdiff
|
tree
2017-09-10
Ju
n
i
o
C
H
amano
Merge branch 'bw/clone-recursive-quiet' into maint
commit
|
commitdiff
|
tree
2017-09-10
Ju
n
io C Hamano
Merge bran
c
h
'pw/seque
n
ce-rerer
e
-
autoupdat
e
' into maint
commit
|
commitdiff
|
tree
2017-09-10
J
u
nio C
H
amano
M
e
rge branch 'bw/push-options-recur
s
ively-to-sub
m
odul
e
s
.
.
.
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
Merge
b
r
a
nch 'm
a
/pag
e
r-per-subc
o
mmand-action' into
.
.
.
commit
|
commitdiff
|
tree
2017-09-10
Ju
n
io C Ham
a
no
Merge branch 'jk/rev-l
i
st-empty-input
'
i
n
to maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
Merge branch 'st/lib-gpg-kill-stray-
a
g
en
t
' into main
t
commit
|
commitdiff
|
tree
2017-08-23
Junio C Ha
m
ano
Prepare for
2
.
1
4
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-23
Junio C Haman
o
M
erge branch 'jt/
t
1
450-fs
c
k-corrupt-packfile'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
Juni
o
C Hamano
Merge bran
c
h 'jb/t8008-clea
n
up
'
into maint
commit
|
commitdiff
|
tree
2017-08-23
J
u
nio C
Hamano
M
e
rge branch '
j
t/subprocess
-
ha
n
ds
h
ake' into
main
t
commit
|
commitdiff
|
tree
2017-08-23
Junio C Hamano
Merge branch 'dc/f
m
t-merge-msg-microcleanup'
into maint
commit
|
commitdiff
|
tree
2017-08-23
J
unio C Haman
o
M
e
rge
b
ranc
h
'ah/doc-wserrorhighlight' into main
t
commit
|
commitdiff
|
tree
2017-08-23
J
unio C Hamano
Merge b
r
anch 'cc/ref-is-hidden-microclea
n
up' into m
a
int
commit
|
commitdiff
|
tree
2017-08-23
Junio C
H
a
mano
Mer
g
e branch 'js/run-process-para
l
lel-
a
pi-fix' into
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
Jun
i
o
C Ha
m
a
n
o
Merge branch 'rs/pack-objec
t
s-pb
a
se-cleanu
p
'
into main
t
commit
|
commitdiff
|
tree
2017-08-23
Junio C Hamano
Me
r
ge b
r
anch 'jt/fsck-code-cl
e
a
n
u
p
'
in
t
o m
a
int
commit
|
commitdiff
|
tree
2017-08-23
Juni
o
C
H
aman
o
M
erge
branch 'rs/stat-data-unaligne
d
-reads-fix'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
Junio
C
Ham
a
no
Mer
g
e branch 'rs/move-array
'
i
n
t
o mai
n
t
commit
|
commitdiff
|
tree
2017-08-23
J
uni
o
C Hamano
Merge branch 'r
s
/bswa
p
-ubsan-fix' into
m
aint
commit
|
commitdiff
|
tree
2017-08-23
Ju
n
io C Hamano
Merge
branch 'dl/creden
t
ial-cache
-
s
o
c
ket-in-xdg-cache
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
Junio C
H
amano
Merge branch 'hb
/
gitweb
-
p
r
oj
e
ct-list' into maint
commit
|
commitdiff
|
tree
2017-08-23
Junio C Hamano
Merge branch 'ks/commit-a
b
ort-on-empt
y
-
m
e
ssage-fix
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
Junio
C
Hamano
M
erg
e
branch 'jk/
r
eflo
g
-walk' in
t
o maint
commit
|
commitdiff
|
tree
2017-08-23
Ju
n
io C Hama
n
o
Merge branch 'jc/http-sslkey-
a
nd-s
s
l-c
e
rt-are-paths
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
Junio C Ha
m
ano
Merge
b
ranch 'jk/ref-filter-colors' into maint
commit
|
commitdiff
|
tree
2017-08-23
Junio C Hamano
M
e
rge branch 'js/git-
g
ui-msgfmt-on-w
i
ndows' into maint
commit
|
commitdiff
|
tree
2017-08-23
Jona
t
h
a
n Nie
d
er
v
c
s-svn: move r
e
m
aining
repo
_
tree functions to fast_export
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-23
J
onathan Nieder
vc
s
-svn: remove repo_delete wra
p
p
e
r function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-23
Jonathan Niede
r
vc
s
-svn:
remove custom m
o
de co
n
stants
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-23
Jonathan Nieder
v
c
s-sv
n
: remove more un
u
sed
p
rototypes and
d
e
clara
t
ions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-23
Jonathan Tan
Doc: c
l
a
rify that pack-
o
bjects
m
ak
e
s
p
ack
s
, plural
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-23
Michael J Grub
e
r
merge: sav
e
merg
e
state earlier
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-23
M
i
chael
J
Gruber
merge
:
split
w
r
ite_merge_state
i
n two
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-23
Michael J Gruber
me
r
ge: cl
a
rify call chain
Suggested-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-22
M
ichael J Gruber
D
o
c
umentati
o
n
/
g
it-merge: explain --cont
i
nue
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-21
brian m
.
carlson
vcs-svn: re
n
ame repo fun
c
t
i
o
ns to "svn_repo"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-21
brian
m
.
car
l
son
vcs-svn: remove unused
prototyp
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-20
Jeff
King
d
o
c
:
fix typo in
s
end
e
mail
.
identi
t
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-19
Torsten Bögersha
u
sen
appl
y
: fil
e
commited with CRLF s
h
ould rou
n
d
t
r
ip dif
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-19
Ren
é
Schar
f
e
commit: r
e
move unused inlin
e
function
single_paren
t
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-19
René Scharfe
archive
:
d
o
n't queue e
x
cluded direc
t
o
ri
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-19
R
ené Scharfe
archive:
fact
o
r
out helper f
u
n
c
t
i
ons for h
a
ndling attribut
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-19
René Scharfe
t
5001: add
t
est
s
for export-ign
o
re
attrib
u
tes and
e
x
c
lude
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-18
Michael J Gruber
Documentation/gi
t
-fo
r
-each-ref: clari
f
y peeling of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-18
Mi
c
hae
l
J
G
r
u
ber
D
ocu
m
en
t
a
tion:
use prope
r
wording for re
f
f
o
rmat strin
g
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-18
Ant
h
ony Sottile
git-grep: correct exit co
d
e with --quiet and -L
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-17
Heiko Voigt
t
552
6
:
fix
s
ome broke
n
&& chains
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-17
Stefan Beller
submodule
.
sh: remove unused variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-16
Torsten
Bögershause
n
con
v
ert: add
S
AFE_CRLF_KEEP_CRLF
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-16
Christian Couder
s
ub-pr
o
ce
s
s:
p
rint the
c
m
d
whe
n
a capability is unsuppo
r
ted
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-15
Stefan Beller
sh
a
1
_
f
ile: make
r
e
a
d_info
_
al
t
e
rnates static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-15
René Scharf
e
t1002:
stop using sum(1)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-14
Andreas
Heiduk
doc: clarify "config --bool" behaviour w
i
th empty string
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-14
Kevin Daud
t
stas
h
: p
r
e
v
ent warning abou
t
nu
l
l bytes
in input
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-10
R
e
né Scharf
e
sha1_file: re
l
e
ase delta_
s
t
a
ck on error in unpack_entry
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-10
René
S
charfe
f
s
ck:
fre
e
buffers on error in fsck_obj
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-10
René Scharfe
win
3
2: plug me
m
ory leak on realloc()
failure in
s
ysl
o
g
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-10
René
S
charfe
me
r
ge
:
use skip_prefix()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-09
Jeff King
ha
s
hcmp: use
m
e
mcmp instead of o
p
en-c
o
ded loop
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-09
R
e
né Sc
h
arfe
app
l
y: remove prefi
x
_leng
t
h member fro
m
a
p
ply_state
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-09
Ramsa
y
Jones
builtin
/
ad
d
: add detail to
a 'canno
t
c
hmo
d
' error message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-09
René
S
cha
r
fe
sha1_file: avoid compar
i
son if no packed hash matches
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-09
René Scharfe
t
4062
:
use l
e
ss tha
n
256 repet
i
t
ion
s
in regex
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-08
René Schar
f
e
t3
7
0
0
: fix broke
n
t
est under !POSIXPE
R
M
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next