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 Hamano
m
erge: teach -Xours/-Xtheirs t
o
symboli
c
l
ink
m
erge
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 Haman
o
R
el
N
otes: further fixes for
2
.
14
.
2 fr
o
m the
m
aster
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-09-10
Junio C
H
amano
M
e
rge branch 'jt/doc-pack-objects-fix' into m
a
int
commit
|
commitdiff
|
tree
2017-09-10
Junio
C Hamano
Me
r
ge branc
h
'jn/vcs-svn-cleanup'
i
n
to
m
aint
commit
|
commitdiff
|
tree
2017-09-10
Junio
C Haman
o
Merge branch 'bc/
v
cs
-
svn-c
l
ean
u
p
'
in
t
o
m
a
i
n
t
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
Merge b
r
anch 'jk/doc-the-this' into maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hama
n
o
Me
r
ge
bran
c
h 'rs/
c
ommit
-
h-single-parent-clean
u
p' into
.
.
.
commit
|
commitdiff
|
tree
2017-09-10
Juni
o
C Hamano
Mer
g
e bran
c
h
'mg/fo
r
mat-ref-d
o
c-f
i
x' into
m
a
in
t
commit
|
commitdiff
|
tree
2017-09-10
Jun
i
o
C
Hamano
M
e
r
ge
branch
'sb/submo
d
ule-
p
arallel-update' into maint
commit
|
commitdiff
|
tree
2017-09-10
Ju
n
io C Ham
a
no
M
e
rg
e
branch '
h
v
/t552
6
-andand-chain-f
i
x' into
m
a
int
commit
|
commitdiff
|
tree
2017-09-10
Ju
n
io C
Ha
m
ano
Merge branch 'sb/sha1-
f
il
e
-cl
e
an
u
p
'
into main
t
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hama
n
o
M
e
rge branch 'rs
/
t1
0
0
2-do-not-use
-
su
m
'
i
nto maint
commit
|
commitdiff
|
tree
2017-09-10
Jun
i
o C Hamano
Merge br
a
nch 'ah/doc-e
m
pt
y
-
s
tring-is-false' into maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hama
n
o
Merge branch 'rs
/
m
erge-mic
r
oclea
n
up'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2017-09-10
J
u
nio C
H
amano
Merge b
r
a
nch 'rs/find-
p
ack-ent
r
y-
b
isection' into mai
n
t
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
Merge branch '
r
s/apply-los
e
-prefix-lengt
h
' into maint
commit
|
commitdiff
|
tree
2017-09-10
Junio
C
H
a
man
o
Merge
b
ranch
'rj/add
-
chmod-er
r
or-m
e
ssag
e
' into m
a
i
n
t
commit
|
commitdiff
|
tree
2017-09-10
Junio C
H
am
a
n
o
Mer
g
e
branch
'jk/hashcmp-memcmp' into main
t
commit
|
commitdiff
|
tree
2017-09-10
Junio C H
a
mano
Me
r
ge branch 'rs/t3700-clea
n
-lefto
v
er' into
maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
Me
r
ge branch
'
jc
/
p
erl-
g
i
t
-comment-
t
ypofix' into
ma
i
n
t
commit
|
commitdiff
|
tree
2017-09-10
Junio C
Ham
a
no
Me
r
ge branch 'mf/
n
o-
d
ashed-subcommands' i
n
to maint
commit
|
commitdiff
|
tree
2017-09-10
Jun
i
o
C Hamano
Merge branc
h
'ab
/
ref-filt
e
r-no
-
co
n
tain
s
'
i
n
t
o
m
a
int
commit
|
commitdiff
|
tree
2017-09-10
J
u
nio C H
a
ma
n
o
Mer
g
e
branch
'rs/ar
c
hive-excluded-directory' in
t
o maint
commit
|
commitdiff
|
tree
2017-09-10
J
uni
o
C Hamano
Merge branch 'mg/killed-merge' into maint
commit
|
commitdiff
|
tree
2017-09-10
Junio
C
Haman
o
Merge branch 'tb/appl
y
-
wi
t
h-crlf
'
into ma
i
nt
commit
|
commitdiff
|
tree
2017-09-10
Jun
i
o C Ha
m
ano
Merge br
a
n
c
h 'cc
/
s
u
bprocess-handshake-missing
-
capabilities
.
.
.
commit
|
commitdiff
|
tree
2017-09-10
J
u
nio C Hamano
Merge branch '
a
s/gre
p
-quiet-no-ma
t
ch-exit-code-fix
.
.
.
commit
|
commitdiff
|
tree
2017-09-10
Junio C
H
amano
Merge branch 'kd/
s
tash-with-b
a
s
h
-4
.
4'
i
nto maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
Merge branch
'rs/win32-sy
s
log-le
a
k
fix'
i
n
t
o
m
aint
commit
|
commitdiff
|
tree
2017-09-10
Junio
C
Hamano
Merge branch 'rs/unpack-entry-leakfix' into maint
commit
|
commitdiff
|
tree
2017-09-10
J
u
nio C
H
a
m
a
no
Merge
b
ranch 'rs/fsck-o
b
j
-
leakfix
'
in
t
o maint
commit
|
commitdiff
|
tree
2017-09-10
J
u
n
io
C Hamano
Me
r
ge bra
n
ch 'ur/svn
-
local-zone' int
o
main
t
commit
|
commitdiff
|
tree
2017-09-10
Junio C
Hamano
Merge bra
n
ch 'pw/am
-
signoff' int
o
maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hama
n
o
Merge branch 'rs/
i
n-obsd-bas
e
name-dirname-take-c
o
n
s
t
.
.
.
commit
|
commitdiff
|
tree
2017-09-10
Junio C Ham
a
n
o
M
e
r
g
e branch 'rs/t4062-obs
d
' int
o
maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C Haman
o
Me
r
ge branch 'rs
/
obsd-getcwd-workaround' into ma
i
nt
commit
|
commitdiff
|
tree
2017-09-10
Junio C Haman
o
Merg
e
b
r
an
c
h
'
b
w
/
clone-re
c
u
r
s
ive-quiet' in
t
o maint
commit
|
commitdiff
|
tree
2017-09-10
Junio
C Hamano
Me
r
ge branch 'pw/
s
equence-rerere-autoupdate' into maint
commit
|
commitdiff
|
tree
2017-09-10
J
unio C Hamano
Merge branch 'bw/push-opt
i
ons-recu
r
si
v
ely-to-submodules
.
.
.
commit
|
commitdiff
|
tree
2017-09-10
Junio C
Hamano
Merge
b
ranch
'
m
a
/pager-per-subcomma
n
d-a
c
tio
n
' into
.
.
.
commit
|
commitdiff
|
tree
2017-09-10
Junio
C
Hamano
Merge branch '
j
k/re
v
-list-empt
y
-i
n
put'
into
maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
M
e
r
g
e b
r
anch 'st/l
i
b-
g
pg-ki
l
l-
s
tra
y
-agent' into maint
commit
|
commitdiff
|
tree
2017-08-23
J
u
nio C H
a
m
a
n
o
Prep
a
re for 2
.
14
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-23
Junio C Hamano
Merge branch 'jt/t1
4
5
0
-f
s
ck-corrupt
-
packfil
e
' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
Junio C Hama
n
o
Merge branc
h
'jb/
t
8008-cleanup' into maint
commit
|
commitdiff
|
tree
2017-08-23
Junio C Hamano
Merge branch
'
jt/sub
p
roce
s
s-
h
andshake' i
n
to main
t
commit
|
commitdiff
|
tree
2017-08-23
J
unio C Hamano
M
e
rge branch 'dc/fmt-merge-msg-microc
l
eanup' into
m
aint
commit
|
commitdiff
|
tree
2017-08-23
Junio C Haman
o
Merge branch 'ah/d
o
c-wse
r
r
o
rh
i
gh
l
i
g
ht'
into maint
commit
|
commitdiff
|
tree
2017-08-23
Junio C Hama
n
o
Merge branch 'cc/ref-is-hid
d
en-microcl
e
a
nup' into maint
commit
|
commitdiff
|
tree
2017-08-23
Junio C Hamano
Mer
g
e bra
n
ch 'js/run-p
r
ocess-parallel-a
p
i
-
fix' into
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
Junio C Hamano
M
e
rge branch 'rs/pack-object
s
-p
b
as
e
-cleanup' into ma
i
nt
commit
|
commitdiff
|
tree
2017-08-23
J
u
nio C Ha
m
a
no
Merge branch
'
jt/fsck-code-
c
leanup
'
into ma
i
nt
commit
|
commitdiff
|
tree
2017-08-23
Jun
i
o
C
H
amano
Merge b
r
an
c
h 'rs
/
stat-d
a
t
a
-unaligne
d
-reads-f
i
x' int
o
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
Jun
i
o C
H
amano
M
er
g
e bran
c
h 'rs/move-array'
int
o
maint
commit
|
commitdiff
|
tree
2017-08-23
J
unio C
H
amano
Merge bran
c
h 'rs/b
s
w
a
p
-ubsan
-
fix'
into maint
commit
|
commitdiff
|
tree
2017-08-23
Junio C
H
amano
Merge branch 'dl/cr
e
dential-
c
ache
-
s
o
c
ke
t
-in-xdg
-
c
a
ch
e
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
Junio C Hamano
Merge bran
c
h
'hb/gitw
e
b
-
project-list'
i
nto main
t
commit
|
commitdiff
|
tree
2017-08-23
Junio C Hamano
Merge branch 'ks/commit-abort-on
-
empty-m
e
ssage-fix
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
Junio
C
Hamano
M
e
rg
e
branch 'j
k
/reflog-wal
k
' into
maint
commit
|
commitdiff
|
tree
2017-08-23
Ju
n
io C Hamano
M
erge branch 'jc/htt
p
-sslkey-and-ssl-cert
-
a
re-pat
h
s
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
J
u
nio C Hamano
Merge
b
ranch 'jk/ref
-
filter-colors' in
t
o maint
commit
|
commitdiff
|
tree
2017-08-23
Junio
C
H
amano
Merge br
a
nch
'
j
s
/
g
it-gui-msgfmt-on-windows
'
into maint
commit
|
commitdiff
|
tree
2017-08-07
J
un
i
o C
H
amano
per
l
/Git
.
pm: t
y
pofix in a com
m
ent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-04
Junio C Hamano
Git 2
.
14
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-04
J
u
nio C Hamano
Me
r
ge ta
g
'
v
2
.
13
.
5' into ma
i
nt
commit
|
commitdiff
|
tree
2017-08-04
J
unio C
H
a
mano
Git 2
.
14
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-04
Junio C H
a
mano
Merge
br
a
nch 'ah/patch
-
id-d
o
c'
commit
|
commitdiff
|
tree
2017-08-04
Ju
n
io C Hamano
M
e
rge branch 'as/diff-o
p
t
io
n
s-grammofix'
commit
|
commitdiff
|
tree
2017-08-02
J
u
nio
C Hamano
Merge t
a
g 'l10n
-
2
.
14
.
0-rnd2' of
g
it://github
.
c
o
m/
g
it
.
.
.
commit
|
commitdiff
|
tree
2017-08-01
Junio C Ham
a
no
Git 2
.
13
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-01
Junio C H
a
mano
Merge tag 'v2
.
12
.
4' into maint
commit
|
commitdiff
|
tree
2017-08-01
Junio C Ha
m
ano
Sync with v2
.
13
.
4
commit
|
commitdiff
|
tree
2017-08-01
Junio C
Hamano
Gi
t
2
.
1
3
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-31
Ju
n
io C Hamano
Sync w
i
th
m
ain
t
commit
|
commitdiff
|
tree
2017-07-31
Jun
i
o C Ham
a
no
Prep
a
ration
f
or 2
.
1
3
.
4 continues
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-31
Junio C Ham
a
no
Merg
e
branc
h
'ks
/
doc-fixes' in
t
o
maint
commit
|
commitdiff
|
tree
2017-07-31
Junio C Hamano
Merge branch 'jk/
t
est-copy-bytes-fix' into ma
i
n
t
commit
|
commitdiff
|
tree
2017-07-31
J
u
n
i
o C Haman
o
Mer
g
e
branch 'pw/
u
n
quot
e
-path-in-git-pm' into main
t
commit
|
commitdiff
|
tree
2017-07-31
Junio C
Ha
m
an
o
M
erge branch 'jk/gc-pre
-
detach
-
under-hoo
k
' into
m
a
i
nt
commit
|
commitdiff
|
tree
2017-07-31
Junio C Ham
a
n
o
Merg
e
branch 'jn/hooks-
p
re
-
rebase-sa
m
ple-fix' into
.
.
.
commit
|
commitdiff
|
tree
2017-07-31
Junio
C
H
amano
Merg
e
b
r
anch 'rs/progres
s
-overall-throughput-at-th
e
.
.
.
commit
|
commitdiff
|
tree
2017-07-31
J
u
nio C Ham
a
no
M
e
rge bran
c
h 'tb
/
push-
t
o-cygwin-unc
-
path' into mai
n
t
commit
|
commitdiff
|
tree
2017-07-31
Juni
o
C H
a
mano
M
erge branch 'rs/apply-avoid-over
-
r
eading
'
i
n
to maint
commit
|
commitdiff
|
tree
2017-07-31
Junio C Hamano
Me
r
ge branch
'js/bla
m
e-l
i
b
'
commit
|
commitdiff
|
tree
2017-07-30
Junio C Ha
m
ano
Git
2
.
12
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-30
Junio
C Ham
a
no
Merge tag 'v2
.
11
.
3' into m
a
int
-
2
.
12
commit
|
commitdiff
|
tree
2017-07-30
Jun
i
o C Hamano
Merge branc
h
'jk/lib-prot
o
-disab
l
e-cle
a
nup'
i
nto maint
.
.
.
commit
|
commitdiff
|
tree
2017-07-30
Junio C Hamano
Git 2
.
11
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-30
Ju
n
io
C Hamano
Merg
e
tag
'
v2
.
10
.
4' into maint-2
.
11
commit
|
commitdiff
|
tree
2017-07-30
J
u
nio C
Hamano
Gi
t
2
.
10
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-30
Junio C Hamano
Mer
g
e tag 'v2
.
9
.
5' into maint-2
.
10
commit
|
commitdiff
|
tree
2017-07-30
Junio C Hama
n
o
Gi
t
2
.
9
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-30
Junio C Haman
o
Me
r
ge t
a
g 'v2
.
8
.
6' into maint-
2
.
9
commit
|
commitdiff
|
tree
2017-07-30
J
uni
o
C H
a
mano
Git 2
.
8
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-30
Junio C Hamano
Merge tag '
v
2
.
7
.
6'
int
o
m
aint-
2
.
8
commit
|
commitdiff
|
tree
2017-07-30
Juni
o
C
Hamano
G
it 2
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-28
Juni
o
C Haman
o
Merge
b
r
anch 'jk/ssh
-
f
u
nn
y
-u
r
l' into
m
aint-2
.
7
commit
|
commitdiff
|
tree
2017-07-28
Juni
o
C
Ha
m
ano
connect: reject ssh
h
ostname
that b
e
gins
w
ith a dash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-26
Junio C Hamano
Me
r
ge
b
r
a
n
ch 'ls/filter-pr
o
cess-
d
elay
e
d'
i
nto jt/subprocess
.
.
.
commit
|
commitdiff
|
tree
2017-07-25
J
unio
C
Hamano
Merge bra
n
ch 'js/msgf
m
t-on-windows
'
of
.
.
/git-gui into
.
.
.
commit
|
commitdiff
|
tree
next