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
merge: teach
-
Xou
r
s
/-Xthei
r
s
to symb
o
lic li
n
k merg
e
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
urt
h
er
f
i
x
e
s for 2
.
14
.
2
from
the master
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-09-10
Juni
o
C Haman
o
Merge branch 'jt/doc
-
pack-objects-fix' into m
a
int
commit
|
commitdiff
|
tree
2017-09-10
Junio C
H
amano
Merge
b
ranch 'jn/vcs-
s
vn-cleanup' into maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C
Ham
a
no
Merge branch
'bc/vcs-
s
vn-cleanup' into maint
commit
|
commitdiff
|
tree
2017-09-10
Jun
i
o
C
Haman
o
Merge
b
ranch
'jk/doc-the-this' into maint
commit
|
commitdiff
|
tree
2017-09-10
Ju
n
io C
Hamano
Merge
b
ranch 'rs
/
com
m
it
-
h-singl
e
-paren
t
-cleanup' into
.
.
.
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
Merge
branch 'mg/format-r
e
f-d
o
c-fix' into
maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
M
erge branch
'
sb/submod
u
le-parallel-upda
t
e' into ma
i
nt
commit
|
commitdiff
|
tree
2017-09-10
Juni
o
C Hamano
Merge b
r
anch 'hv/t5526-an
d
and-chai
n
-fix' into maint
commit
|
commitdiff
|
tree
2017-09-10
Ju
n
io C
H
amano
Merge bran
c
h 'sb/sha1-file-cleanup' into
m
aint
commit
|
commitdiff
|
tree
2017-09-10
Jun
i
o C Hamano
Mer
g
e
b
ranch 'rs/t
1
002-do-
n
ot-use
-
s
um' into maint
commit
|
commitdiff
|
tree
2017-09-10
J
unio C Hamano
Merge br
a
nch
'ah/d
o
c-empty-string-is-f
a
lse' into
maint
commit
|
commitdiff
|
tree
2017-09-10
Ju
n
io C Haman
o
Merge
branch
'
rs/merge-microcleanup' into maint
commit
|
commitdiff
|
tree
2017-09-10
Junio
C
Hamano
Merge branch 'rs/find-pa
c
k-entry-bisect
i
on' i
n
to m
a
in
t
commit
|
commitdiff
|
tree
2017-09-10
J
unio C H
a
mano
Merge
bra
n
ch 'rs/
a
pply-lose-prefix-length
'
i
nto maint
commit
|
commitdiff
|
tree
2017-09-10
J
unio
C
H
amano
Merge branch
'rj/add-chmod
-
error-message'
i
nt
o
m
a
i
n
t
commit
|
commitdiff
|
tree
2017-09-10
Juni
o
C H
a
mano
Merge b
r
anch 'jk/h
a
s
hcmp-memcmp
'
into
m
aint
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hama
n
o
Merge br
a
nch 'rs/t3700-c
l
ean-leftover' i
n
to m
a
int
commit
|
commitdiff
|
tree
2017-09-10
Junio C H
a
mano
Merge
b
ranch
'
jc/perl-git
-
c
o
mment-typofix
'
into maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
Merge branch 'mf/no-
d
ash
e
d-sub
c
ommands'
i
nto maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C Ha
m
ano
Merge branch 'ab/ref-filter
-
n
o-cont
a
ins'
i
n
to maint
commit
|
commitdiff
|
tree
2017-09-10
Jun
i
o C Hamano
M
e
r
ge branch
'
rs/ar
c
hive-excluded-
d
irectory' into maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
Merge
b
r
a
nch 'mg/kille
d
-merge' into maint
commit
|
commitdiff
|
tree
2017-09-10
Junio
C Hamano
Merge bra
n
c
h
'tb/apply-with-crlf' into
m
aint
commit
|
commitdiff
|
tree
2017-09-10
J
unio C Hamano
Merge branch 'cc/subp
r
ocess-han
d
shak
e
-missing-c
a
pabilities
.
.
.
commit
|
commitdiff
|
tree
2017-09-10
Jun
i
o C Hamano
Merge branch
'
as/grep-quie
t
-no-match-ex
i
t-
c
ode-
f
ix
.
.
.
commit
|
commitdiff
|
tree
2017-09-10
J
unio
C
Haman
o
Merge branc
h
'kd/stash-with-bash-4
.
4'
i
nto
mai
n
t
commit
|
commitdiff
|
tree
2017-09-10
Junio C Ha
m
ano
Merge br
a
n
c
h
'rs/
w
in3
2
-syslog
-
leak
f
ix' into maint
commit
|
commitdiff
|
tree
2017-09-10
J
u
nio C Hamano
Merge bra
n
c
h
'rs
/
u
n
p
a
c
k
-entry-leakfix' into m
a
int
commit
|
commitdiff
|
tree
2017-09-10
Junio C Haman
o
Mer
g
e branch 'rs/fsck-obj-leakfix' into
m
a
i
nt
commit
|
commitdiff
|
tree
2017-09-10
Junio C Ha
m
ano
Merge branc
h
'ur
/
s
v
n-local-zone' in
t
o maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C Ha
m
a
no
Merge br
a
n
c
h 'p
w
/am-signoff' into
m
a
i
nt
commit
|
commitdiff
|
tree
2017-09-10
J
u
ni
o
C Hamano
Merg
e
branch 'r
s
/i
n
-obs
d
-basename-dirname-take-con
s
t
.
.
.
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hama
n
o
Merge bra
n
ch 'rs/t4062-ob
s
d
'
i
n
to m
a
int
commit
|
commitdiff
|
tree
2017-09-10
J
u
n
i
o
C
Hamano
Merge branch '
r
s/obsd-get
c
w
d
-wor
k
a
round' into maint
commit
|
commitdiff
|
tree
2017-09-10
J
u
n
i
o C
Ham
a
no
M
erge branch 'bw
/
clone-recursive-quiet
'
into maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C Haman
o
Merg
e
b
r
anch '
p
w/sequ
e
nce-
r
erere-autoupdate
'
into maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C
H
amano
M
e
rge branch
'b
w
/push-o
p
tion
s
-recursively-to-submodules
.
.
.
commit
|
commitdiff
|
tree
2017-09-10
J
un
i
o C Hamano
Me
r
g
e
b
r
anc
h
'ma/pager-per-subco
m
mand-action' into
.
.
.
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
Merge branc
h
'jk/rev-list-empt
y
-in
p
ut' into maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
Merge branch
'
st/lib
-
gpg
-
ki
l
l-stray-
a
gent' into maint
commit
|
commitdiff
|
tree
2017-08-23
Junio
C Hamano
Pr
e
pare
f
or 2
.
14
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-23
Jun
i
o C
H
amano
M
erge bran
c
h
'
jt/t1450-fsck
-
corru
p
t
-
p
ackfile' into
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
Junio C Hamano
M
erge branch
'jb
/
t8
0
08-cleanup' into maint
commit
|
commitdiff
|
tree
2017-08-23
Junio
C
Hama
n
o
Merge branch 'j
t
/su
b
process-handshake' into ma
i
n
t
commit
|
commitdiff
|
tree
2017-08-23
J
unio C Hamano
Merge branch 'dc/
f
m
t
-merge-msg-
m
i
c
rocleanup' in
t
o maint
commit
|
commitdiff
|
tree
2017-08-23
J
unio C Haman
o
M
erge branch 'ah/doc-
w
serrorhighlight' into maint
commit
|
commitdiff
|
tree
2017-08-23
Ju
n
io C Hamano
Me
r
g
e branch 'cc/ref-is-hidden-microclean
u
p
'
int
o
maint
commit
|
commitdiff
|
tree
2017-08-23
Ju
n
i
o C Hamano
Merge br
a
n
ch '
j
s
/
run-pr
o
cess-parallel-a
p
i-fix' into
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
Junio C
H
a
m
ano
Merge branch 'rs/pac
k
-
o
bjects
-
pbase-cle
a
nup' into maint
commit
|
commitdiff
|
tree
2017-08-23
Junio C Hamano
M
er
g
e branch 'jt/fsck-code
-
c
leanu
p
' into m
a
int
commit
|
commitdiff
|
tree
2017-08-23
Junio C
H
amano
Merge branch 'rs
/
stat-data
-
unali
g
n
e
d-reads-fi
x
' into
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
J
unio C
Hamano
Merge branch 'rs/m
o
ve-ar
r
ay' into maint
commit
|
commitdiff
|
tree
2017-08-23
Ju
n
io C Hamano
Merge
b
ra
n
ch 'rs/bswap
-
ubsan-fix' into
m
a
int
commit
|
commitdiff
|
tree
2017-08-23
Juni
o
C Hamano
Merg
e
b
r
anch 'dl/cr
e
dential-ca
c
he-socket-
i
n-xd
g
-cache
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
Junio C Hamano
M
erge branc
h
'
h
b
/gitweb-project-
l
ist'
into
maint
commit
|
commitdiff
|
tree
2017-08-23
Jun
i
o C Hamano
Merge br
a
nch
'
k
s/commit-abort-on-empty
-
m
e
ssag
e
-fix
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
Junio C H
a
mano
Merge
branch 'jk
/
reflog-walk
'
into maint
commit
|
commitdiff
|
tree
2017-08-23
Junio C Haman
o
Merge branch 'jc/http-ssl
k
e
y
-and-ssl-cert-
a
re
-
pa
t
h
s
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
J
unio
C
Hamano
Mer
g
e
branch 'jk/ref
-
filter-colors' into m
a
int
commit
|
commitdiff
|
tree
2017-08-23
J
u
nio C
H
amano
Merg
e
branc
h
'
j
s/git-gui-msgfmt-on-
w
indows' into mai
n
t
commit
|
commitdiff
|
tree
2017-08-07
Junio C H
a
mano
perl/Git
.
pm: typofix in a
c
o
mment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-04
Jun
i
o C Ham
a
no
G
i
t
2
.
14
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-04
J
unio C
Hamano
Mer
g
e ta
g
'v2
.
13
.
5' into maint
commit
|
commitdiff
|
tree
2017-08-04
Junio C Hamano
Git 2
.
1
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-08-04
J
unio C Hamano
Merge
b
r
a
n
ch '
a
h/
p
atch-id-doc'
commit
|
commitdiff
|
tree
2017-08-04
Junio C Hamano
Merge branch 'as/d
i
ff-options-
g
rammo
f
ix'
commit
|
commitdiff
|
tree
2017-08-02
Junio C Hama
n
o
Mer
g
e tag 'l10n-
2
.
14
.
0-rnd2' of
g
it://
g
i
t
hub
.
com/git
.
.
.
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
Jun
i
o C H
a
m
a
no
Me
r
ge tag '
v
2
.
12
.
4' into maint
commit
|
commitdiff
|
tree
2017-08-01
Junio C Ha
m
a
n
o
S
ync with v2
.
13
.
4
commit
|
commitdiff
|
tree
2017-08-01
Junio C
H
a
mano
G
it 2
.
13
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-07-31
Junio C Ha
m
a
n
o
Sync with
m
aint
commit
|
commitdiff
|
tree
2017-07-31
J
u
nio C Haman
o
Preparation for 2
.
1
3
.
4 continues
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-07-31
Junio
C
H
a
mano
M
e
rge branch
'
k
s/doc-fixes' into main
t
commit
|
commitdiff
|
tree
2017-07-31
Jun
i
o C Hamano
Mer
g
e branch 'jk/test-copy-bytes-fix'
i
nto maint
commit
|
commitdiff
|
tree
2017-07-31
Junio C Hama
n
o
Merge br
a
nch 'p
w
/unq
u
ote-pat
h
-in-git-pm' into maint
commit
|
commitdiff
|
tree
2017-07-31
Junio C Ham
a
no
Merge b
r
anch
'jk/gc-pr
e
-d
e
tach-un
d
er-hoo
k
'
i
nto maint
commit
|
commitdiff
|
tree
2017-07-31
J
unio
C
H
a
mano
Merge bran
c
h '
j
n/hook
s
-pr
e
-rebase-sample-fi
x
' into
.
.
.
commit
|
commitdiff
|
tree
2017-07-31
J
unio
C
Hama
n
o
M
e
r
g
e b
r
anch '
r
s/
p
rogres
s
-overal
l
-throughput-at-
t
he
.
.
.
commit
|
commitdiff
|
tree
2017-07-31
Junio C Ha
m
a
n
o
Merg
e
branch
'tb/push-to-cygwin-unc-p
a
t
h' i
n
t
o maint
commit
|
commitdiff
|
tree
2017-07-31
Junio C
H
aman
o
Merge
b
ranch 'rs/apply-avoid-
o
ver-r
e
ading
'
into main
t
commit
|
commitdiff
|
tree
2017-07-31
Junio C Hamano
M
erge bra
n
c
h
'
js/blam
e
-
l
i
b'
commit
|
commitdiff
|
tree
2017-07-30
Junio C Hamano
Git 2
.
12
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-07-30
Junio
C
Hamano
Merge
t
ag 'v2
.
11
.
3'
into m
a
int-2
.
1
2
commit
|
commitdiff
|
tree
2017-07-30
Junio C Ha
m
ano
Merge branch 'jk/lib-pr
o
t
o
-disable-c
l
eanup' in
t
o maint
.
.
.
commit
|
commitdiff
|
tree
2017-07-30
Jun
i
o C Haman
o
Git 2
.
11
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-07-30
J
unio C Ha
m
ano
Merge tag
'v2
.
10
.
4' into maint-2
.
11
commit
|
commitdiff
|
tree
2017-07-30
Junio C H
a
m
a
no
Git 2
.
10
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-07-30
Junio C Hamano
Mer
g
e ta
g
'v
2
.
9
.
5' into maint-2
.
1
0
commit
|
commitdiff
|
tree
2017-07-30
Junio
C
H
a
mano
Gi
t
2
.
9
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-07-30
Junio C
H
amano
M
e
rge tag 'v2
.
8
.
6'
int
o
maint-2
.
9
commit
|
commitdiff
|
tree
2017-07-30
J
unio
C
H
a
mano
Git 2
.
8
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-07-30
Ju
n
io
C
Hamano
Merge tag '
v
2
.
7
.
6' into maint-
2
.
8
commit
|
commitdiff
|
tree
2017-07-30
Junio C Hamano
Git 2
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-07-28
Ju
n
io C H
a
mano
M
e
rge
b
ranch 'jk/ssh-funny-url' into
maint-2
.
7
commit
|
commitdiff
|
tree
2017-07-26
Junio C Ham
a
n
o
Merge
bra
n
ch '
l
s/filter-
p
roc
e
ss-d
e
layed' into
j
t/subproces
s
.
.
.
commit
|
commitdiff
|
tree
2017-07-25
J
u
n
i
o C H
a
mano
Merge
b
ranch 'js
/
msgfmt-
o
n-windows' of
.
.
/git-gui
i
nto
.
.
.
commit
|
commitdiff
|
tree
2017-07-24
Junio C
Ham
a
no
Git 2
.
14-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next