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
unio C
Hamano
merge: teach
-X
o
ur
s
/
-
X
t
heirs to symbolic link m
e
rge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-09-10
J
unio C
Hamano
R
e
l
Notes: furt
h
er fixes
f
or 2
.
1
4
.
2 fro
m
the ma
s
ter
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-09-10
Jun
i
o
C
Hamano
Mer
g
e branch 'jt/
d
o
c
-
p
a
ck-objects
-
fix' into maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
Merge bran
c
h
'
jn/vcs-svn-clean
u
p'
i
n
to m
a
int
commit
|
commitdiff
|
tree
2017-09-10
J
unio C H
a
mano
M
e
rge
br
a
nch 'bc
/
v
cs-svn-c
l
eanup' in
t
o
maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C H
a
mano
M
erge br
a
nch 'j
k
/doc
-
th
e
-this' in
t
o maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
M
erge bran
c
h 'rs
/
commit-h-
s
ingl
e
-p
a
ren
t
-clea
n
u
p
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2017-09-10
J
u
nio C Ham
a
no
Merg
e
bran
c
h 'm
g
/for
m
at-ref-
d
oc-fix' into m
a
int
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
Merg
e
bran
c
h 'sb
/
submodul
e
-parallel-update'
into
m
aint
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
Merge branch 'hv/t5526-andand-ch
a
in-fix' in
t
o maint
commit
|
commitdiff
|
tree
2017-09-10
J
u
nio C Ha
m
a
no
Merge br
a
nch 'sb/sha1-file-cleanup' i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2017-09-10
Junio
C
Ha
m
ano
Merge
bra
n
c
h
'rs/t1002-do-not-use-sum' into main
t
commit
|
commitdiff
|
tree
2017-09-10
Junio
C
Hamano
Merge
b
ranch 'ah/doc-empty-string-is-false' into mai
n
t
commit
|
commitdiff
|
tree
2017-09-10
Ju
n
i
o
C H
a
man
o
Merge
b
ranch 'rs/merge-m
i
crocle
a
n
u
p
'
into maint
commit
|
commitdiff
|
tree
2017-09-10
Ju
n
io C
Hamano
Merge branch 'rs/
f
ind-pack-e
n
try
-
b
i
s
e
cti
o
n
'
into
m
aint
commit
|
commitdiff
|
tree
2017-09-10
J
unio C
H
a
mano
M
e
rge bran
c
h 'rs/appl
y
-lose-pre
f
ix
-
length' into
m
aint
commit
|
commitdiff
|
tree
2017-09-10
Juni
o
C
H
amano
Me
r
ge branch '
r
j/ad
d
-
chmod-error-
m
essage' into ma
i
nt
commit
|
commitdiff
|
tree
2017-09-10
Junio C
H
aman
o
Merge branch 'jk/hashcmp-memcmp' into maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
Merge branch 'rs
/
t3
7
00-clean-l
e
ftover' into
maint
commit
|
commitdiff
|
tree
2017-09-10
Jun
i
o C Hamano
Merge
branch
'
j
c/p
e
rl-git-
c
ommen
t
-typofix' into maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hama
n
o
Mer
g
e branch 'mf/no-dashed-subcom
m
ands
'
into maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hama
n
o
M
erge bra
n
ch
'
ab/ref-
f
il
t
er-no-contains'
into maint
commit
|
commitdiff
|
tree
2017-09-10
J
u
nio
C
Hamano
Merge branch 'rs/
a
rch
i
ve-excluded-directory' into maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hama
n
o
M
erge branch 'mg
/
killed-merge'
into maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
Merge
b
ranch 'tb/ap
p
ly-with-crlf
'
into ma
i
nt
commit
|
commitdiff
|
tree
2017-09-10
Junio
C
Hamano
Merge branch
'cc/subpro
c
ess-h
a
n
d
sh
a
ke-missing-c
a
pab
i
l
ities
.
.
.
commit
|
commitdiff
|
tree
2017-09-10
Junio C Ham
a
no
M
e
rge branch 'as/grep-quiet
-
no-match-e
x
it-code-fix
.
.
.
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
M
e
r
g
e branch '
k
d/
s
tash-
w
ith-
b
ash-4
.
4' int
o
mai
n
t
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
Merge
branch
'rs/win32-syslog-leakfix' into
maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
Merge b
r
anch 'rs/u
n
pac
k
-entry-le
a
kfix' i
n
t
o
maint
commit
|
commitdiff
|
tree
2017-09-10
Juni
o
C Haman
o
Merge branch 'rs/fsck
-
obj-le
a
kfi
x
' in
t
o m
a
int
commit
|
commitdiff
|
tree
2017-09-10
J
uni
o
C Hamano
Merge branch
'ur/svn-local-zo
n
e'
i
nto
mai
n
t
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
M
erge branch 'pw/am-sig
n
of
f
'
i
nto maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
M
er
g
e branch 'rs/in-obsd-bas
e
name-dirname-take-const
.
.
.
commit
|
commitdiff
|
tree
2017-09-10
Junio
C
H
am
a
no
Me
r
ge branch 'r
s
/t4062-obs
d
' into maint
commit
|
commitdiff
|
tree
2017-09-10
Juni
o
C Hamano
Merg
e
branch
'rs/obsd-getcwd-wo
r
karo
u
n
d' into
ma
i
n
t
commit
|
commitdiff
|
tree
2017-09-10
Junio
C Hama
n
o
Merge br
a
nch 'b
w
/clone-recursive-qu
i
et'
into maint
commit
|
commitdiff
|
tree
2017-09-10
Junio C Ha
m
ano
Merge b
r
a
n
ch
'pw/sequence-rerere-a
u
toupdate' into maint
commit
|
commitdiff
|
tree
2017-09-10
J
u
nio C
H
a
mano
Mer
g
e branch
'
bw/pu
s
h-op
t
ions-rec
u
rsively-to-submod
u
l
e
s
.
.
.
commit
|
commitdiff
|
tree
2017-09-10
Ju
n
io C Haman
o
Merge bran
c
h 'ma/
p
a
g
e
r
-per-subcommand-action
'
into
.
.
.
commit
|
commitdiff
|
tree
2017-09-10
Junio C Ha
m
ano
Merge branch 'jk/r
e
v-list-empty-input
'
in
t
o
m
aint
commit
|
commitdiff
|
tree
2017-09-10
Junio C Hamano
M
e
r
g
e br
a
nch 'st/lib-gpg-kill-stray-agent' into maint
commit
|
commitdiff
|
tree
2017-08-23
J
u
n
io C Hamano
Prepare for 2
.
1
4
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-23
Junio C
Hamano
Merg
e
branch 'jt/t1450-fsck-corr
u
p
t-packfile' into
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
J
u
nio
C
Hamano
Merg
e
branch 'jb/t8008-
c
leanup' into maint
commit
|
commitdiff
|
tree
2017-08-23
Juni
o
C Haman
o
Merg
e
b
ranch
'
jt/subprocess-
h
ands
h
ake
'
into mai
n
t
commit
|
commitdiff
|
tree
2017-08-23
Junio C Hamano
Mer
g
e branch 'dc/fmt-merge-msg-
m
icroclea
n
up' into maint
commit
|
commitdiff
|
tree
2017-08-23
Junio C Ham
a
n
o
Merge
branch 'ah/doc-
w
se
r
rorhigh
l
igh
t
' into maint
commit
|
commitdiff
|
tree
2017-08-23
Juni
o
C Hamano
M
e
rge branch 'cc/ref-is
-
hid
d
e
n-
m
ic
r
oclean
u
p' into maint
commit
|
commitdiff
|
tree
2017-08-23
Junio C
Hama
n
o
Merge bra
n
ch '
j
s
/run-process-parallel-api-fix'
into
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
Junio C Hamano
Merge branch 'rs/pack-objects
-
pbase-
c
leanup' into maint
commit
|
commitdiff
|
tree
2017-08-23
Junio C H
a
mano
Merge
b
r
a
nch 'jt/fsck-co
d
e-clean
u
p'
i
nt
o
maint
commit
|
commitdiff
|
tree
2017-08-23
Junio C Ham
a
no
Merge branc
h
'
r
s
/stat-d
a
t
a
-
u
n
aligne
d
-
r
e
ads-fix
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
Junio C Ha
m
ano
Me
r
ge b
r
anch 'rs/move-array' into maint
commit
|
commitdiff
|
tree
2017-08-23
Junio C Haman
o
Merg
e
branch 'rs/bswap-u
b
san-
f
ix' into maint
commit
|
commitdiff
|
tree
2017-08-23
Junio C Ha
m
ano
M
erge bran
c
h 'dl/credential-cach
e
-s
o
cket
-
in-x
d
g-ca
c
he
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
J
u
n
io C Haman
o
Mer
g
e bra
n
ch 'hb/gitweb-project-list' into maint
commit
|
commitdiff
|
tree
2017-08-23
Junio
C Hamano
Merge branch 'ks/co
m
mit
-
abort
-
on-empty
-
m
e
s
sa
g
e-fix
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
Junio C Hamano
Merge branch 'jk/r
e
flo
g
-walk
'
into ma
i
nt
commit
|
commitdiff
|
tree
2017-08-23
J
u
nio C Ha
m
ano
M
erge branch '
j
c/ht
t
p-sslkey
-
and-ssl-cert-are-pa
t
hs
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
J
u
nio C Ha
m
ano
Merge branc
h
'jk/ref-filter
-
col
o
rs' into main
t
commit
|
commitdiff
|
tree
2017-08-23
Juni
o
C
H
amano
Merge b
r
a
n
ch 'js/git-gui-msgfmt-
o
n-wind
o
ws' i
n
to maint
commit
|
commitdiff
|
tree
2017-08-07
Junio C Ha
m
an
o
perl/
G
it
.
pm: typo
f
ix
i
n
a
c
omment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-04
Junio C Haman
o
Git 2
.
1
4
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-04
Junio C Hama
n
o
M
e
rge
t
a
g
'v
2
.
13
.
5' into maint
commit
|
commitdiff
|
tree
2017-08-04
J
unio C Hamano
Git
2
.
14
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-04
J
u
nio C Hamano
Merge branch
'
ah/patch-id-doc'
commit
|
commitdiff
|
tree
2017-08-04
Junio C Hamano
Merge branch 'as/diff
-
option
s
-grammofix'
commit
|
commitdiff
|
tree
2017-08-02
J
u
nio C Hamano
Mer
g
e tag 'l10n-
2
.
14
.
0-rnd2
'
of gi
t
:
//github
.
com/git
.
.
.
commit
|
commitdiff
|
tree
2017-08-01
Ju
n
io C Hamano
Gi
t
2
.
1
3
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-01
Ju
n
io C
H
ama
n
o
Merge tag '
v
2
.
1
2
.
4' into maint
commit
|
commitdiff
|
tree
2017-08-01
Junio
C
Hamano
S
y
nc with v
2
.
13
.
4
commit
|
commitdiff
|
tree
2017-08-01
J
u
nio C Hamano
Gi
t
2
.
13
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-31
Junio C
Hamano
Sy
n
c with m
a
in
t
commit
|
commitdiff
|
tree
2017-07-31
Junio C
Hamano
Prep
a
r
a
t
i
o
n for 2
.
13
.
4 c
o
ntinue
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-31
Ju
n
io
C Hamano
Mer
g
e branch 'ks/doc-fixes' into maint
commit
|
commitdiff
|
tree
2017-07-31
Ju
n
io C Ha
m
ano
Merge branch 'jk/test-c
o
p
y-by
t
es-f
i
x' into m
a
int
commit
|
commitdiff
|
tree
2017-07-31
Junio
C Hama
n
o
Merge
b
ranch 'pw/unquote-path-in-git-pm' into maint
commit
|
commitdiff
|
tree
2017-07-31
Jun
i
o
C
Ham
a
no
Merge b
r
anch 'jk/g
c
-pre-d
e
tach-under-ho
o
k'
i
nto maint
commit
|
commitdiff
|
tree
2017-07-31
Junio C Hamano
Merge b
r
anch
'
jn/hooks-pre-rebase-sample-fix' into
.
.
.
commit
|
commitdiff
|
tree
2017-07-31
Junio C Hamano
Merg
e
branch 'rs
/
progress-ov
e
rall-throughp
u
t
-at-
t
he
.
.
.
commit
|
commitdiff
|
tree
2017-07-31
Ju
n
io C Ha
m
ano
Merge
branch 'tb/push-to-cygw
i
n
-
unc
-
path' i
n
to main
t
commit
|
commitdiff
|
tree
2017-07-31
J
u
nio C Hama
n
o
Merge
branch 'rs/appl
y
-avoid-over-re
a
ding' into maint
commit
|
commitdiff
|
tree
2017-07-31
Ju
n
i
o C Hama
n
o
M
erge branch
'
j
s/b
l
ame-lib'
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
J
u
nio C
H
amano
Merge tag 'v2
.
11
.
3' into maint-2
.
12
commit
|
commitdiff
|
tree
2017-07-30
Junio C Hama
n
o
Merge bra
n
ch
'jk/li
b
-
p
r
o
t
o-disable-
c
lea
n
up' i
n
to mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2017-07-30
Junio C Hama
n
o
G
i
t 2
.
1
1
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-30
Junio C Ham
a
no
Merge t
a
g 'v2
.
10
.
4
'
into maint-2
.
11
commit
|
commitdiff
|
tree
2017-07-30
J
u
n
i
o C Hamano
G
it
2
.
10
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-30
Junio C Ham
a
no
Mer
g
e
tag 'v2
.
9
.
5' into
maint-2
.
10
commit
|
commitdiff
|
tree
2017-07-30
Junio C Ha
m
ano
Git 2
.
9
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-30
Junio C Haman
o
Merge tag 'v2
.
8
.
6
' in
t
o maint-2
.
9
commit
|
commitdiff
|
tree
2017-07-30
Junio
C
Ham
a
no
Git 2
.
8
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-30
J
un
i
o C
Hamano
Merge tag
'v2
.
7
.
6'
i
nto
m
a
i
nt-2
.
8
commit
|
commitdiff
|
tree
2017-07-30
Juni
o
C Hamano
Git 2
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-28
Junio C H
a
mano
Merge branc
h
'jk/ssh-funn
y
-url
'
into
m
ai
n
t
-
2
.
7
commit
|
commitdiff
|
tree
2017-07-28
Jun
i
o C Hamano
co
n
nect: reject ssh ho
s
tna
m
e that beg
i
ns
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
H
am
a
n
o
Merge branch 'ls/filter-process-del
a
yed'
i
nto j
t
/
s
ubproc
e
ss
.
.
.
commit
|
commitdiff
|
tree
2017-07-25
Ju
n
i
o C Hamano
Merg
e
b
r
anch
'js/msgf
m
t-o
n
-wind
o
ws
'
of
.
.
/
git-gui into
.
.
.
commit
|
commitdiff
|
tree
next