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
Junio C Hama
n
o
merge: teach -Xo
u
rs/-
X
the
i
r
s to 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
Jun
i
o
C
H
amano
RelNotes: further fixes
f
or
2
.
14
.
2 fro
m
t
h
e mas
t
er
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-09-10
Junio C Ha
m
ano
Merge branch
'
jt/d
o
c-pack-
o
b
je
c
ts-fix' into
maint
commit
|
commitdiff
|
tree
2017-09-10
Junio
C Hamano
Merge branch
'
jn/v
c
s-svn-cleanup' in
t
o main
t
commit
|
commitdiff
|
tree
2017-09-10
Junio C
H
amano
Merg
e
b
ranch
'bc/vcs-s
v
n
-cle
a
nup'
int
o
maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hama
n
o
M
e
rge bran
c
h 'jk/do
c
-the-this' into maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C Ha
m
ano
Merge br
a
nch 'rs
/
commit-h-singl
e
-p
a
r
e
nt-clea
n
up' int
o
.
.
.
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
Merge branch '
m
g/f
o
r
m
at-ref-doc-fi
x
' i
n
t
o mai
n
t
commit
|
commitdiff
|
tree
2017-09-10
Junio C Ha
m
ano
Merge branc
h
'sb/submodule-
p
arallel-update'
into main
t
commit
|
commitdiff
|
tree
2017-09-10
J
unio C Hamano
Merg
e
branch 'hv/t55
2
6-andand-chain
-
fix' i
n
to ma
i
n
t
commit
|
commitdiff
|
tree
2017-09-10
Jun
i
o C Hamano
Merge branch 'sb/sha1-file
-
cleanup' i
n
to m
a
int
commit
|
commitdiff
|
tree
2017-09-10
J
u
nio
C
Hamano
Merge branch '
r
s/
t
1002-do-not
-
use
-
sum' into main
t
commit
|
commitdiff
|
tree
2017-09-10
J
u
n
io C Hamano
Merge br
a
n
c
h 'ah/doc-empty-str
i
ng
-
is-false' in
t
o maint
commit
|
commitdiff
|
tree
2017-09-10
Ju
n
io C Haman
o
Merge br
a
nch 'rs/merge-microc
l
eanup' into maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C
H
aman
o
Merg
e
branch 'rs/find-pa
c
k-en
t
ry-bisection' i
n
to
m
a
int
commit
|
commitdiff
|
tree
2017-09-10
J
u
nio C H
a
mano
Merge bran
c
h 'rs/app
l
y-lose-prefix-lengt
h
' into
m
ain
t
commit
|
commitdiff
|
tree
2017-09-10
Junio C Ha
m
ano
M
e
rge branch '
r
j
/
add-chmod-e
r
ror
-
mess
a
ge'
i
nto maint
commit
|
commitdiff
|
tree
2017-09-10
Ju
n
io C Hamano
M
e
r
ge
b
ranch 'jk/hashcmp-memcmp
'
i
n
to maint
commit
|
commitdiff
|
tree
2017-09-10
Jun
i
o
C
H
a
mano
Merge branch 'rs/t3700-clean-lef
t
over'
into mai
n
t
commit
|
commitdiff
|
tree
2017-09-10
Junio C Ham
a
no
Merge branc
h
'
j
c/perl-g
i
t-com
m
ent-t
y
pofix' into ma
i
nt
commit
|
commitdiff
|
tree
2017-09-10
Junio
C
H
ama
n
o
Merg
e
branch 'mf
/
no-
d
ashed-subcomma
n
d
s
' into
m
aint
commit
|
commitdiff
|
tree
2017-09-10
J
u
nio C Hamano
Me
r
ge branch '
a
b
/
r
ef-filte
r
-no-c
o
ntains'
into maint
commit
|
commitdiff
|
tree
2017-09-10
J
u
nio C
Haman
o
M
e
rge branch 'rs
/
a
r
chive-ex
c
luded-dire
c
tor
y
' into maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
Mer
g
e branch
'm
g
/ki
l
l
e
d-
m
erge' into maint
commit
|
commitdiff
|
tree
2017-09-10
J
unio C Hamano
Me
r
ge branch 'tb/ap
p
l
y-with-
c
rlf'
i
nto
ma
i
nt
commit
|
commitdiff
|
tree
2017-09-10
J
unio C H
a
mano
Merg
e
branch 'cc/subproce
s
s-h
a
ndshake
-
m
i
ssi
n
g-capab
i
lities
.
.
.
commit
|
commitdiff
|
tree
2017-09-10
J
u
nio C Hamano
Merge branch '
a
s/grep-quiet-
n
o
-match-exit-code-fix
.
.
.
commit
|
commitdiff
|
tree
2017-09-10
Juni
o
C Hamano
M
e
r
ge
b
ranch 'kd/sta
s
h-wit
h
-
bash
-
4
.
4' into maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C Haman
o
Merge branch 'rs/win32
-
syslog-le
a
kfix' into m
a
int
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
Merge branch 'r
s
/
u
npack-entry-
l
eakfix'
i
nto maint
commit
|
commitdiff
|
tree
2017-09-10
Junio
C
Hamano
Merge
branch
'
rs/fs
c
k
-obj
-
leakfix'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2017-09-10
Jun
i
o C Hama
n
o
Merge br
a
nch 'ur
/
svn-local-zone' into maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
Mer
g
e b
r
anch
'
p
w/am
-
si
g
noff'
i
nto maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
Merge b
r
anch 'rs/
i
n-obsd-basen
a
me-dirn
a
me
-
take-const
.
.
.
commit
|
commitdiff
|
tree
2017-09-10
J
u
nio C Hama
n
o
M
e
rge branch
'
rs/t4062
-
obsd' into maint
commit
|
commitdiff
|
tree
2017-09-10
Junio
C
Ha
m
ano
Merge branch
'rs/obsd-getcwd
-
workaround' into main
t
commit
|
commitdiff
|
tree
2017-09-10
J
u
nio C Ham
a
no
M
e
rge
branch
'
b
w
/clone-r
e
cursive-quiet' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
Merge
branch
'
pw/
s
eq
u
ence-
r
e
rere-auto
u
pdate' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2017-09-10
Junio
C
Ha
m
ano
Merge
branch 'bw/push-options-recursi
v
ely-to-subm
o
dules
.
.
.
commit
|
commitdiff
|
tree
2017-09-10
Junio
C
Hamano
Merge branch 'ma/
p
ager-per
-
subc
o
m
mand-actio
n
' into
.
.
.
commit
|
commitdiff
|
tree
2017-09-10
Jun
i
o C Ha
m
ano
Me
r
ge bra
n
ch 'jk/rev
-
list-empty-input' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2017-09-10
Jun
i
o C Haman
o
M
erg
e
br
a
nch 'st/lib
-
gpg-kill-s
t
ray-agent' i
n
t
o main
t
commit
|
commitdiff
|
tree
2017-08-23
Juni
o
C H
a
mano
P
repare for 2
.
14
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-23
Junio C Hamano
Me
r
ge branch 'jt/
t
1450
-
fsck
-
corrupt-packfile'
i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
Junio C Hamano
Merge branch 'jb/t800
8
-cleanup'
into maint
commit
|
commitdiff
|
tree
2017-08-23
Juni
o
C
Hamano
Merge branch 'j
t
/subproc
e
ss-handshake' into
m
ai
n
t
commit
|
commitdiff
|
tree
2017-08-23
Junio C Hamano
Merge branch 'dc/fmt-merge-m
s
g-m
i
crocleanup' into ma
i
nt
commit
|
commitdiff
|
tree
2017-08-23
J
u
nio C Ha
m
ano
Merge branch 'ah/doc-w
s
errorhigh
l
ight'
into
maint
commit
|
commitdiff
|
tree
2017-08-23
J
u
nio
C Ha
m
a
no
Merge branch 'cc/ref-i
s
-hidden
-
microcleanup'
into maint
commit
|
commitdiff
|
tree
2017-08-23
Junio C Ham
a
no
Mer
g
e bran
c
h
'js/run-
p
rocess-parallel-a
p
i-
f
ix' into
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
Junio C
Hamano
Merge
branch 'rs/pac
k
-obje
c
ts-pbas
e
-clea
n
up
'
in
t
o maint
commit
|
commitdiff
|
tree
2017-08-23
Junio
C
Ha
m
ano
Merge branch
'
jt/fsck
-
code-cleanup' into
maint
commit
|
commitdiff
|
tree
2017-08-23
Junio
C Hamano
Merge b
r
anch 'rs/stat-data-u
n
aligned-reads-f
i
x' into
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
J
u
nio
C
H
a
mano
Merge branc
h
'rs/mov
e
-array' into maint
commit
|
commitdiff
|
tree
2017-08-23
Junio C Hamano
Merge bra
n
ch 'r
s
/bsw
a
p-ubsa
n
-f
i
x' into main
t
commit
|
commitdiff
|
tree
2017-08-23
Junio C
Hamano
Mer
g
e branch 'dl/credentia
l
-cache-socket-in-xdg-cac
h
e
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
Junio C Hamano
Me
r
ge branch
'
h
b/gitweb
-
project-li
s
t' i
n
to maint
commit
|
commitdiff
|
tree
2017-08-23
Junio C Ham
a
no
M
erg
e
b
ranch 'ks/com
m
i
t
-a
b
o
rt-on-empt
y
-messag
e
-fix
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
Junio C
H
amano
Merge
branch 'jk/ref
l
o
g-walk' into maint
commit
|
commitdiff
|
tree
2017-08-23
Jun
i
o C
H
aman
o
Merge
b
r
a
nch '
j
c/http-
s
slkey-and-ssl-cert-ar
e
-paths
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
Junio C
H
a
m
a
no
M
erge branch 'jk/ref-filter-colors' int
o
maint
commit
|
commitdiff
|
tree
2017-08-23
Junio
C
Hamano
Merge
branch 'js/git
-
gui-
m
sgfmt-on
-
windows' into maint
commit
|
commitdiff
|
tree
2017-08-23
Jon
a
than Nied
e
r
v
c
s
-svn: mov
e
remaining repo_tre
e
func
t
i
o
ns to f
a
st_export
.
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-23
Jonathan Nieder
vcs
-
svn: remove repo_delete wrapper fu
n
ction
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-23
J
o
nathan Nieder
vcs-svn:
r
emove custom mode constan
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-23
Jonathan Nie
d
er
vc
s
-svn
:
remove
m
ore unused pro
t
otypes and d
e
clarations
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-23
Jon
a
than Tan
D
o
c
:
c
larify that pack-
o
bjects makes packs, plural
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-23
Michael J Gruber
mer
g
e: save merge
s
t
a
t
e earlier
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-23
Michael J G
r
ub
e
r
merge: spli
t
write_m
e
r
g
e_state in two
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-23
M
i
c
h
a
el J Gr
u
ber
merge: clarify call
c
h
a
in
Suggested-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-22
Michael J Gruber
Docum
e
ntation
/
git-merg
e
: explain -
-
continu
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-21
brian m
.
carlson
v
c
s
-sv
n
: r
e
name
r
epo
f
unctions to
"
svn_repo"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-21
brian m
.
carlson
vcs-svn: remove unused prototypes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-20
J
ef
f
King
doc: fix typo in sendemail
.
i
d
e
n
tity
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-19
Torst
e
n
B
ög
e
r
s
hau
s
en
apply: file
c
o
mmited with C
R
LF should rou
n
dt
r
ip
d
iff
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-19
René Sc
h
arfe
commit: r
e
move unuse
d
inl
i
ne fun
c
t
i
on
s
ingle_p
a
re
n
t(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-19
René Scharfe
archive: don't queue exclud
e
d
directories
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-19
René Scha
r
fe
ar
c
hive: factor
o
u
t h
e
lpe
r
functions fo
r
hand
l
ing attributes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-19
R
ené
S
c
h
ar
f
e
t5001: add te
s
t
s for export-i
g
nore attrib
u
t
es and exclude
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-18
Mi
c
hael J Gru
b
er
Docu
m
entation/git-for-each
-
r
ef: clar
i
fy p
e
e
ling of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-18
Mi
c
hael J Gruber
Document
a
tion:
u
s
e
proper wording for
r
ef format strings
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-18
Anth
o
ny
Sottile
git-grep: correct exit code with --quie
t
and -L
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-17
Heiko Voigt
t
5
52
6
: fix some broken && chains
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-17
Stefan Bell
e
r
submodule
.
s
h
: remove unused
vari
a
ble
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-16
Torsten
B
ögers
h
a
u
sen
c
onvert: add SAFE_CRL
F
_KEEP_CRLF
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-16
Christian Couder
sub-process: print the cmd when a capability is unsu
p
ported
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-15
Stefan Bel
l
er
sha1
_
file: make read
_
info_al
t
e
r
nates st
a
tic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-15
R
e
né Scharfe
t100
2
: stop using sum(1)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-14
And
r
eas He
i
du
k
doc: clari
f
y "conf
i
g
--bool" beha
v
iour with empty string
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-14
Kevin Dau
d
t
s
t
ash:
p
revent warning abo
u
t null
bytes in input
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-10
René Scharfe
sha
1
_file: relea
s
e delta_stack on error
i
n
un
p
ack_e
n
try()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-10
René Scharfe
fsck: free buf
f
ers on error in fsc
k
_obj()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-10
René Scha
r
fe
w
in3
2
: plug memor
y
leak on rea
l
loc(
)
fail
u
re in syslog()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-10
R
e
n
é Scharf
e
merge: u
s
e skip_prefix()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-09
J
eff Ki
n
g
ha
s
hcmp: use memcmp instead of
open-coded l
o
op
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-09
Ren
é
Scharfe
apply: remove prefix_length member from
a
p
p
ly
_
state
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-09
Rams
a
y
J
ones
builtin/add: add detail to a 'ca
n
n
ot
c
h
mod' error message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-09
René Sch
a
rfe
s
h
a1_file: avoi
d
comparison if no pa
c
ked hash m
a
t
ch
e
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-09
René Scharfe
t40
6
2: use less than 256 repetitio
n
s in regex
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-08
René
S
charfe
t3700: fix b
r
oken test under !PO
S
IXPER
M
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next