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 branch 'sb/ref-lock-lose-lock-fd'
2015-05-19
Junio C Hamano
Mer
g
e
branch 'sb/ref-lock
-
lose-loc
k
-
f
d'
commit
|
commitdiff
|
tree
2015-05-19
Junio C
H
am
a
no
Merge b
r
an
c
h 'kn/cat-file-literally'
commit
|
commitdiff
|
tree
2015-05-19
Jun
i
o C Ha
m
ano
Merge b
r
anch 'nd/dwim
-
wildcards-as-
p
a
t
hspec
s
'
commit
|
commitdiff
|
tree
2015-05-19
Junio C H
a
mano
Merge branch 'jc/merge'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Me
r
ge branch '
p
h/re
b
ase-i-red
o
'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Ha
m
ano
Merge branch
'
jc/te
s
t-prereq-v
a
lidate'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge branch 'bc/connect-pli
n
k'
commit
|
commitdiff
|
tree
2015-05-19
Junio
C
H
a
m
ano
Merge branch 'jk/test-chain-lint'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Haman
o
Merg
e
branch 'fg/document-comm
i
t
-message-st
r
ipping'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge b
r
anch 'jk/s
t
ash-require-clean-index'
commit
|
commitdiff
|
tree
2015-05-19
J
unio C Haman
o
Merg
e
branch
'jk/git-no
-
mor
e
-argv
0
-
p
ath-munging'
commit
|
commitdiff
|
tree
2015-05-19
Junio
C
Hamano
M
erge branch 'jc/gitignore-
p
rece
d
e
nce
'
commit
|
commitdiff
|
tree
2015-05-19
Ju
n
io C
Hamano
Merg
e
branch 'nd/diff-i-t-a'
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
S
ync with
2
.
4
.
1
commit
|
commitdiff
|
tree
2015-05-13
Ju
n
io C Hamano
Git 2
.
4
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
Merge bra
n
ch 'sb/line-log-plug
-
pairdiff-leak' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
J
un
i
o C
Hamano
Merge b
r
a
nch '
s
b/te
s
t-b
i
tmap-free-at-end'
into maint
commit
|
commitdiff
|
tree
2015-05-13
Ju
n
io C Hamano
Merge branch 'nd/t150
9
-chroot-test
'
into maint
commit
|
commitdiff
|
tree
2015-05-13
J
u
nio C
H
a
mano
Merg
e
branch 'jk/t
y
pe-from-s
t
ring-gen
t
ly'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
M
erge branch 'ep/fix-te
s
t-lib-fu
n
ct
i
on
s
-report
'
into
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Ju
n
io C Hamano
Me
r
ge branch 'cn/bom-in-gitignore
'
into
m
aint
commit
|
commitdiff
|
tree
2015-05-13
Junio C Ha
m
ano
Merge
b
ranch
'
j
k/prune-mti
m
e'
i
nto
m
aint
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
M
e
rge branch
'jk/i
n
it-co
r
e-worktre
e
-a
t
-root' i
n
to
maint
commit
|
commitdiff
|
tree
2015-05-11
Junio
C Hamano
M
erge branch
'
maint'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C Hamano
Sync with 2
.
3
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
a
mano
Git 2
.
3
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-11
Junio C H
a
mano
Merge branch
'mm/us
a
ge-
l
og-l-ca
n
-take-
r
eg
e
x' into maint-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio C H
a
mano
Merge branch 'jc/diff-no-index-d
-
f' in
t
o maint-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merg
e
branch
'
oh/fix-config-def
a
u
l
t
-user-name
-
se
c
tion
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio
C
Hamano
Merge branch 'jc/epochti
m
e-wo-tz' in
t
o
m
a
i
nt-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Seco
n
d batch for 2
.
5 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-11
Junio C
Hama
n
o
Merge branc
h
'pt/xd
g
-config-pat
h
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C H
a
mano
Merge
br
a
nch 'ep/d
o
-not-f
e
ed
-
a
-point
e
r-t
o
-array-si
z
e
'
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
i
o
C Hamano
Merge branch 'jc/hash-object'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C Hamano
M
e
rge branch 'sb
/
p
r
efix-p
a
th-free-
r
esults'
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
io C Hamano
M
e
rge bra
n
c
h
'sg/completi
o
n-no-redundant-all-comma
n
d
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
J
unio
C Hamano
Merge branch 'sg/comp
l
ete-decorate-full
-
no
t
-long
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Me
r
ge branch 'jk/fil
t
er-branch-use-of-sed-on-i
n
complet
e
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C Haman
o
Mer
g
e br
a
n
ch
'jc
/
daemon-no-ip
v
6
-
for
-
2
.
4
.
1'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C
H
am
a
no
Merge branc
h
'jn/c
l
e
an-use-error-not-fprin
t
f-on-stderr'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Mer
g
e branc
h
'tb/blame-re
s
u
r
rect-convert-to-git'
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o C Hama
n
o
Merge
b
r
anch
'
v
a/fix-
g
it-p4-test
s
'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C Hamano
Mer
g
e branch
'
ld/p4
-
case-fol
d
'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C
Hamano
M
erge
br
a
nc
h
'jk/rebase-quie
t
-noop'
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
io C Hamano
Merg
e
branch 'va/p4-client-path'
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o C Hamano
Merge branch 'mm
/
add-p-split-error'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ham
a
no
Merg
e
branch 'tb/t0027-crlf'
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C Ha
m
ano
M
e
rge bra
n
ch 'ls
/
p4-changes-block-size'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge
b
ranch 'jc/plug-fmt-m
e
r
g
e-msg-leak'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Haman
o
M
e
rge branch
'nd/slim
-
index-
p
ack-memory-usage
'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C Hamano
Mer
g
e branch 'j
k
/st
i
l
l
-
interesting'
commit
|
commitdiff
|
tree
2015-05-11
Junio C H
a
m
a
no
M
e
r
ge
branch 'jk/reading-pack
e
d
-
refs'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch
'
lm/squelch-bg-progress'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
Hamano
Merge branch 'jk/sh
a
1-fi
l
e
-
reduce-useless-warning
s
'
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o C Hamano
Merge branch '
n
d/multiple-work
-
tre
e
s'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merg
e
bran
c
h
'
pt/c
r
edential-xdg'
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C Ham
a
no
First batch for 2
.
5 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o C H
a
mano
M
e
rg
e
branch 'jk/prune-mtime'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
H
a
m
ano
Merge branch 'mm/
u
sage-log-l-c
a
n-tak
e
-regex'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Mer
g
e br
a
nch
'e
p
/fix-t
e
st-li
b
-functio
n
s-report'
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io C Hamano
M
erge branc
h
'c
n
/bom-in-gitigno
r
e'
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C Ha
m
a
n
o
Merg
e
br
a
n
c
h 'jc/epochtime-
w
o-t
z
'
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C Hamano
Merge branc
h
'nd/t1509-chroot-test'
commit
|
commitdiff
|
tree
2015-05-06
J
uni
o
C
H
amano
Merg
e
branch 'oh/fix
-
c
o
nfig-
d
efault-
u
ser-nam
e
-s
e
ction'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
M
e
r
ge bra
n
ch 'jk/type-from-string-gently'
commit
|
commitdiff
|
tree
2015-05-06
Junio C
H
a
man
o
Mer
g
e bra
n
ch 'sb/test-b
i
tmap
-
free-at-end'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C Hama
n
o
Merge branch 'ld/p4-fil
e
type-detecti
o
n'
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io C Hamano
Mer
g
e branch 'ts/checkout
-
advice-plu
r
al'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hama
n
o
Merge branch 'j
k
/init-core-workt
r
ee-at-root'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge
branch 'mh/show-branch-topic'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge branch 'sb/line-log-plug
-
pai
r
diff-leak'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
Haman
o
Mer
g
e branch
'jc/diff-n
o
-index-d-f'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge bran
c
h
'bc/ob
j
ect-id'
commit
|
commitdiff
|
tree
2015-05-05
Jun
i
o C
H
am
a
no
daemon: u
n
break
NO_IPV
6
build regres
s
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-05
J
u
nio C Haman
o
w
rite_sha
1
_file(): do not use a s
e
parate sha1
[
] array
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-30
Junio C Hamano
G
it 2
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o C Hamano
merge: deprecate 'git
merge <message> HEAD
<commit
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C Ha
m
a
n
o
merg
e
: handle FETCH_HEAD int
e
r
nally
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
unio C Hamano
me
r
ge: decide if we auto-g
e
nerate the
m
essage early
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: make collect_par
e
nts() au
t
o-ge
n
era
t
e th
e
merge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio C
H
amano
merge: extract p
r
epare_merge_message() logic out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o C Hamano
m
e
r
g
e
:
n
arr
o
w
sco
p
e of merge_names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o
C
Hamano
me
r
ge
:
split
r
e
duce_parents() out
of co
l
lect_parents()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Hamano
m
e
rge: clarify collect_parents() logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C
Ham
a
no
merge: small leakfi
x
and
c
o
de simplificatio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io C H
a
m
a
no
merge: do not check arg
c
to
d
etermine
number
o
f remote
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o C Haman
o
merge:
clarify "pulli
n
g
i
n
t
o voi
d
" spe
c
ial case
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
t552
0
:
t
est pul
l
ing an octopus into an unborn br
a
nc
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
u
n
io C Ham
a
no
t
5520: style fixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ha
m
ano
m
erge
:
simplify code flow
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C Haman
o
merge: test
t
he top-level merge driver
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-28
J
unio C Haman
o
test: validate prerequistes syntax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-28
Ju
n
i
o C Hamano
Me
r
ge branch 'mh/multim
a
i
l-re
n
e
w
al'
commit
|
commitdiff
|
tree
2015-04-28
Junio C Hamano
Merge br
a
nch 'mg
/
show-not
e
s-doc'
commit
|
commitdiff
|
tree
2015-04-28
Juni
o
C
H
a
mano
M
e
rge branch 'nd
/
v
e
rsion
c
mp-pr
e
releases'
commit
|
commitdiff
|
tree
2015-04-28
J
u
nio C Haman
o
Merge b
r
anch 'm
g
/statu
s
-
v-
v
'
commit
|
commitdiff
|
tree
2015-04-27
J
un
i
o C
H
a
m
a
no
Sync with 2
.
3
.
7
commit
|
commitdiff
|
tree
2015-04-27
Junio C H
a
mano
Gi
t
2
.
3
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-27
Jun
i
o C H
a
mano
Merge bran
c
h
'
tb/c
o
nnect-i
p
v6-p
a
rs
e
-fix'
into maint
commit
|
commitdiff
|
tree
2015-04-27
Ju
n
io C Hama
n
o
M
erg
e
branch 'm
a
/bash-completion-
l
eaking-x' into maint
commit
|
commitdiff
|
tree
next