repo.or.cz
/
alt-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
Junio
C H
a
mano
merge: teach -Xours/-
X
th
e
irs
t
o symbolic 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 Hamano
RelNotes: f
u
rther fixes for 2
.
14
.
2 fro
m
the ma
s
te
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
Mer
g
e br
a
nch 'jt/doc-pack-o
b
j
e
cts-fix' int
o
maint
commit
|
commitdiff
|
tree
2017-09-10
Ju
n
io C Hamano
M
e
rge branch
'
jn/vcs-svn-cleanup'
i
nt
o
maint
commit
|
commitdiff
|
tree
2017-09-10
Ju
n
io C Hamano
Mer
g
e bra
n
ch '
b
c/vcs-svn-c
l
eanup' into maint
commit
|
commitdiff
|
tree
2017-09-10
Junio
C
Hamano
M
e
rge b
r
anch
'
jk/do
c
-the-this' into maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
Merge bran
c
h
'rs/co
m
mit-h-sin
g
le-parent-cleanup'
int
o
.
.
.
commit
|
commitdiff
|
tree
2017-09-10
Junio C H
a
mano
Merge branch '
m
g
/
format-ref-
d
oc-fix' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2017-09-10
Ju
n
io C H
a
m
a
no
Me
r
ge b
r
anch 's
b
/submodule-par
a
llel-update' in
t
o
m
aint
commit
|
commitdiff
|
tree
2017-09-10
Juni
o
C Haman
o
M
e
rge branc
h
'hv/t5526-andan
d
-
c
hain-fix'
int
o
m
a
int
commit
|
commitdiff
|
tree
2017-09-10
Juni
o
C
H
amano
Merge branch
'sb/sha1-file-cleanup'
into maint
commit
|
commitdiff
|
tree
2017-09-10
Ju
n
i
o
C Hamano
Merge br
a
nch 'rs/t1002-do-not-
u
se-sum'
i
nto maint
commit
|
commitdiff
|
tree
2017-09-10
Jun
i
o C
H
a
mano
Merge branch 'ah
/
d
oc-empty-string-is-false
'
into
m
a
i
nt
commit
|
commitdiff
|
tree
2017-09-10
Junio C Ha
m
ano
Merge bran
c
h
'rs/merge-micr
o
cleanup'
i
n
to maint
commit
|
commitdiff
|
tree
2017-09-10
Juni
o
C H
a
mano
Merge bra
n
ch 'rs/find-pack-entry-bisection' into
m
aint
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
Me
r
ge branch 'rs/apply-lo
s
e-prefi
x
-l
e
n
g
th' into
maint
commit
|
commitdiff
|
tree
2017-09-10
J
unio C Hamano
Mer
g
e branch
'
rj/add-
c
hmo
d
-e
r
ror-messa
g
e
'
i
nto maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
M
e
rge
branch 'jk/
h
ashcmp
-
m
emc
m
p' into maint
commit
|
commitdiff
|
tree
2017-09-10
Ju
n
io C
Hamano
Merge branc
h
'rs
/
t
37
0
0
-c
l
ean-l
e
ftover' into mai
n
t
commit
|
commitdiff
|
tree
2017-09-10
Juni
o
C H
a
mano
Merge bran
c
h 'jc/perl-git-comment-typofix' into maint
commit
|
commitdiff
|
tree
2017-09-10
Juni
o
C Haman
o
M
erg
e
branch 'mf/no-dashed-subcommands' in
t
o maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
Merge
branch 'ab/re
f
-filter-no-contains
'
in
t
o maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
Merge
b
ranch 'rs/archive-exclu
d
e
d-directory' into maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
Merge bran
c
h
'
mg/killed-m
e
rge' into
m
a
i
nt
commit
|
commitdiff
|
tree
2017-09-10
Ju
n
io C H
a
mano
M
erge
bra
n
ch 'tb/a
p
p
l
y-with-crlf' into
maint
commit
|
commitdiff
|
tree
2017-09-10
J
unio C Hamano
Merge branch 'cc/
s
ubprocess-handshake-m
i
ssing-
c
apabilities
.
.
.
commit
|
commitdiff
|
tree
2017-09-10
Junio C
Ham
a
no
Merge br
a
nch 'as
/
g
r
ep-quiet-no-match-exit-
c
ode-
f
i
x
.
.
.
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hama
n
o
Merge b
r
a
nch 'kd/stash-with-bash
-
4
.
4' int
o
maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
Merge br
a
n
c
h 'r
s
/win32-sy
s
log-lea
k
fix
'
into maint
commit
|
commitdiff
|
tree
2017-09-10
Ju
n
io C Ha
m
an
o
M
e
rge branch
'
rs
/
unpa
c
k
-e
n
try-le
a
kfix
'
into ma
i
nt
commit
|
commitdiff
|
tree
2017-09-10
Ju
n
io
C Hamano
M
e
r
ge branch 'rs/fsck-obj-leakfix' into maint
commit
|
commitdiff
|
tree
2017-09-10
Juni
o
C
Hama
n
o
Merg
e
branch 'ur/s
v
n-local
-
zone'
i
n
to main
t
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
Merge branch 'pw/am-signoff
'
into
maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C
H
ama
n
o
Merge branch 'rs/i
n
-obsd-base
n
ame-dirn
a
me-take-const
.
.
.
commit
|
commitdiff
|
tree
2017-09-10
Ju
n
i
o
C H
a
mano
M
erge
b
ranch 'rs/
t
4
0
62-obsd' into maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C
H
amano
Merge bra
n
ch 'rs/
o
bsd-getcwd-wo
r
karo
u
nd' into
m
a
in
t
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hama
n
o
Merge branch 'bw/
c
l
o
ne
-
recursive-q
u
iet
'
into m
a
int
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
M
e
rge b
r
anch 'pw/sequence
-
rerere-autoup
d
a
te' into ma
i
nt
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
Merge br
a
n
c
h '
b
w
/push
-
op
t
ions-recur
s
ively-to-submodules
.
.
.
commit
|
commitdiff
|
tree
2017-09-10
Junio
C
H
am
a
no
Merg
e
branch 'ma/p
a
ger
-
per
-
s
u
bcommand-action' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2017-09-10
J
u
nio C Hamano
Merge
br
a
nch 'jk/rev-list-empty-input' into maint
commit
|
commitdiff
|
tree
2017-09-10
J
un
i
o C Hamano
Merge branch 'st/lib-gpg-kill-stray-agent'
i
n
to maint
commit
|
commitdiff
|
tree
2017-08-23
Juni
o
C Hamano
Pre
p
are
f
o
r
2
.
14
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-23
J
u
n
io C
H
a
m
ano
M
e
r
g
e branch 'jt/t1450-fsck-corrupt-pac
k
fi
l
e'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
Junio
C
H
amano
Merge branch 'jb/t8008-cleanu
p
' i
n
to
maint
commit
|
commitdiff
|
tree
2017-08-23
J
unio C Hamano
Mer
g
e branch
'jt/
s
ubpro
c
ess-handshake' into ma
i
nt
commit
|
commitdiff
|
tree
2017-08-23
J
u
nio C Hama
n
o
Merge branc
h
'd
c
/fmt-merge-m
s
g-mi
c
rocleanup' i
n
to maint
commit
|
commitdiff
|
tree
2017-08-23
J
u
nio C Ham
a
n
o
Merge br
a
nch 'ah/doc-wserrorh
i
ghlight
'
into
maint
commit
|
commitdiff
|
tree
2017-08-23
Junio C Hamano
Merge branch
'
cc/r
e
f-is
-
hidden-micr
o
c
l
e
anup' into maint
commit
|
commitdiff
|
tree
2017-08-23
Juni
o
C Hamano
Merge
b
ra
n
c
h
'j
s
/run-proc
e
ss-p
a
r
al
l
el-ap
i
-fi
x
' into
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
Junio
C
H
a
m
a
no
Merge branch 'rs
/
pack-objects-pbase-cleanup' i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2017-08-23
Juni
o
C Ham
a
no
Merge branch 'jt/fsck-c
o
de
-
cleanup
'
into maint
commit
|
commitdiff
|
tree
2017-08-23
Junio C Hamano
Merge branch 'rs/stat-data-unali
g
n
e
d-reads-fix' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
Junio
C
Haman
o
Merge branch 'r
s
/m
o
v
e
-ar
r
a
y
' int
o
mai
n
t
commit
|
commitdiff
|
tree
2017-08-23
Juni
o
C Hamano
Merge branch 'rs/bswap-ubsan-fix'
i
nto maint
commit
|
commitdiff
|
tree
2017-08-23
Junio C
H
amano
Me
r
g
e
branch
'dl/credential
-
c
ache-socket-in-x
d
g-cache
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
Junio
C H
a
mano
Merge
b
r
a
nc
h
'
h
b
/gitw
e
b-project-list'
int
o
maint
commit
|
commitdiff
|
tree
2017-08-23
Juni
o
C
H
a
mano
Merge branch 'ks/
c
ommi
t
-a
b
ort-on-empty-messag
e
-fix
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
J
unio C Ha
m
ano
Merge bran
c
h
'
j
k/reflog-walk' into
m
aint
commit
|
commitdiff
|
tree
2017-08-23
J
u
nio C Hamano
Merge bran
c
h
'jc/htt
p
-
s
s
l
key-and-s
s
l-cert-are-paths
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
Junio C Ha
m
ano
Merge branch '
j
k/ref-filter-c
o
lors' into ma
i
nt
commit
|
commitdiff
|
tree
2017-08-23
Ju
n
io
C Ha
m
a
no
Mer
g
e branch 'js/
g
it-gui-ms
g
fmt-on-window
s
' into maint
commit
|
commitdiff
|
tree
2017-08-23
Jo
n
athan Nieder
vc
s
-svn: move remaining rep
o
_t
r
ee funct
i
ons to fas
t
_
e
x
port
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-23
Jo
n
atha
n
Ni
e
d
e
r
vcs-
s
vn: remo
v
e repo
_
dele
t
e wrapper function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-23
J
o
nathan Nieder
vcs-svn:
r
emove cus
t
o
m
m
ode constants
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-23
Jonathan Nieder
vcs-svn
:
remove
m
o
re unus
e
d prototypes and declarations
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-23
Jon
a
than Tan
Do
c
:
clarify that pack-
o
bject
s
mak
e
s
packs,
p
lural
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-23
Michae
l
J Gruber
merge
:
sa
v
e merge state ea
r
lier
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-23
Michael J G
r
uber
merge: split write_merge_st
a
te in t
w
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-23
M
ichael J Gruber
merge: clarify 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 Grube
r
Do
c
umentation/git-m
e
rge: ex
p
lain --continue
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-21
brian m
.
c
arlson
vcs-svn: rename
r
epo fun
c
tions to "svn_repo"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-21
brian
m
.
carlson
vcs-svn: rem
o
ve unused prototy
p
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-20
Jeff King
doc:
fix typo
i
n sendemail
.
iden
t
ity
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-19
To
r
sten Bögershausen
a
p
ply: f
i
l
e commi
t
ed with CRLF
s
hould roundtrip
d
iff
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-19
René Scharfe
comm
i
t
:
remo
v
e unu
s
ed inline function sin
g
le
_
parent()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-19
René Scharfe
a
rchive:
don't qu
e
ue excluded
d
irectories
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-19
R
e
n
é
S
charfe
archive: factor o
u
t h
e
lpe
r
func
t
ion
s
for
h
andling att
r
ibute
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-19
R
e
né S
c
harfe
t5001:
a
dd tests for exp
o
rt-ignore a
t
tri
b
utes and exclude
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-18
Mi
c
hael J Gruber
D
ocumentation/git-for-ea
c
h-ref:
clarify peeling o
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-18
Micha
e
l J Gruber
Do
c
ume
n
tation: use proper wording
f
or ref forma
t
st
r
i
n
g
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-18
Anthony Sot
t
i
le
g
i
t-grep: correct exit code with --quie
t
and -L
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-17
H
eiko Vo
i
gt
t
5
526: f
i
x some
broken && c
h
ains
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-17
Ste
f
a
n
Beller
subm
o
dul
e
.
sh: remove u
n
used
var
i
able
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-16
T
ors
t
en Bögershaus
e
n
convert: add SAFE_CRLF
_
KEEP_CRL
F
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-16
C
h
ristia
n
Cou
d
er
sub-pro
c
es
s
: pr
i
nt the cmd when a capa
b
ility is unsup
p
ort
e
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-15
Stefan Bell
e
r
sha1_
f
i
l
e
: make read_info_alterna
t
es static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-15
René Scharfe
t1002: s
t
op using sum(1)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-14
And
r
e
a
s He
i
d
u
k
doc: clarify "c
o
nfig --bool"
b
ehaviour with empty string
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-14
Kevin Daudt
stash
:
pr
e
vent
warnin
g
about nul
l
bytes in input
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-10
René Scha
r
fe
sha1_file: release
d
elta_stack on error in
u
npack_entry
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-10
René S
c
harfe
fsck: f
r
e
e
buffers on e
r
ror in
fsck_obj()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-10
Re
n
é
S
cha
r
fe
win32: plug memo
r
y leak on realloc() failure
i
n syslog()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-10
René Schar
f
e
m
e
rg
e
: use skip_prefix()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-09
Jeff King
hashcmp: use mem
c
m
p
i
n
stea
d
o
f
open-coded loop
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-09
R
e
né Scharfe
apply: remove prefix_length mem
b
er from
a
pply_state
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-09
Ramsay Jones
builtin/add: add detail
to a 'c
a
nn
o
t chmod
'
error message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-09
René
Scha
r
fe
s
ha1_fi
l
e
:
avo
i
d co
m
pa
r
ison if n
o
packed hash matche
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-09
René Scharfe
t4062:
use less th
a
n 25
6
repetitions in
regex
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-08
René Sch
a
rfe
t
3700: fix broke
n
tes
t
under !POSIXPERM
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next