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
Third batch for 2.5 cycle
2015-05-19
Junio
C Haman
o
Th
i
rd batch f
o
r 2
.
5 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merg
e
branch 'sb/ref-lock-lose-lock-fd'
commit
|
commitdiff
|
tree
2015-05-19
J
u
nio C Hamano
Me
r
ge branch 'kn/cat-file-
l
iterally'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Mer
g
e
b
ranch
'nd
/
dwim-wild
c
ards-
a
s-pat
h
spec
s
'
commit
|
commitdiff
|
tree
2015-05-19
Junio C H
a
man
o
Merge branch
'
jc/merge'
commit
|
commitdiff
|
tree
2015-05-19
Junio
C
Hamano
Merge b
r
anch 'ph/rebase-i-redo'
commit
|
commitdiff
|
tree
2015-05-19
J
unio C
H
amano
M
e
r
ge branch
'jc/test-p
r
ere
q
-
v
alidate'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
M
erge
bra
n
ch
'bc/co
n
nect
-
plink'
commit
|
commitdiff
|
tree
2015-05-19
Jun
i
o C
H
a
mano
Merge branch 'j
k
/
test-ch
a
in-lint'
commit
|
commitdiff
|
tree
2015-05-19
Junio C
Hamano
Merge branch 'fg/
d
ocument-c
o
mmit-mes
s
age-
s
tripping'
commit
|
commitdiff
|
tree
2015-05-19
Junio C
Ham
a
no
M
e
rge br
a
n
ch 'jk/stash-req
u
ire-clean-in
d
ex'
commit
|
commitdiff
|
tree
2015-05-19
Jun
i
o C Ha
m
an
o
M
erge branch 'jk
/
git-no-more
-
argv0-path-m
u
nging'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
M
e
r
g
e branch 'jc/giti
g
nore-p
r
ecedence'
commit
|
commitdiff
|
tree
2015-05-19
Ju
n
io C Haman
o
Merge branch 'nd/di
f
f-i-
t
-a'
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
S
ync with 2
.
4
.
1
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
Git 2
.
4
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Juni
o
C Hamano
Merge branch 'sb
/
line-lo
g
-plug-p
a
irdiff-leak' int
o
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
M
erg
e
branch 'sb/te
s
t
-bitmap-fr
e
e-
a
t-end' into mai
n
t
commit
|
commitdiff
|
tree
2015-05-13
Juni
o
C Hamano
Merge branch
'nd/t1509
-
ch
r
oot-test' into maint
commit
|
commitdiff
|
tree
2015-05-13
Junio C H
a
man
o
Merge br
a
nch 'jk/type-fro
m
-
str
i
ng
-
gently' into
m
aint
commit
|
commitdiff
|
tree
2015-05-13
Junio C
Hama
n
o
Merge branch 'ep/fix-test-lib-functions-repor
t
' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
J
unio C Hamano
M
e
rge branch '
c
n/bom-in-g
i
tignore' into maint
commit
|
commitdiff
|
tree
2015-05-13
J
u
nio C Hamano
Me
r
g
e
b
ranch '
j
k/prune
-
m
time' into maint
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
Merge br
a
nch 'jk/
i
n
it-
c
ore-worktree-at-root' into maint
commit
|
commitdiff
|
tree
2015-05-11
J
unio
C
Haman
o
M
e
rge b
r
an
c
h 'maint
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C H
a
m
a
no
S
y
n
c
w
ith 2
.
3
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o C Hamano
Git 2
.
3
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ham
a
no
Merge branch 'mm/usage-lo
g
-
l
-
can-tak
e
-regex' into maint-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C Hama
n
o
M
e
rge
branch 'j
c
/diff-no-index-d-f' in
t
o mai
n
t-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio
C Hamano
Merge br
a
nch 'o
h
/
fix-conf
i
g-default-user-name-sectio
n
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'jc
/
ep
o
chtim
e
-
w
o-tz' i
n
to ma
i
nt-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
i
o
C H
a
mano
Second batch for 2
.
5 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-11
J
u
n
io C Hamano
Merge branch
'pt/xdg-c
o
nfig-p
a
th'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ha
m
an
o
M
e
rge
b
ranch '
e
p/do
-
n
o
t-f
e
e
d
-a-po
i
nter-to-a
r
ray-s
i
ze'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge br
a
n
c
h
'jc/hash-object'
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o C Haman
o
Merge branch 'sb/pre
f
ix-p
a
th-f
r
ee-re
s
u
l
ts
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C H
a
mano
Merge b
r
anch 'sg/completion-n
o
-redundant-all-co
m
mand
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
a
m
a
n
o
Merg
e
bra
n
ch
'sg/co
m
plete-
d
e
corate-fu
l
l-not-long'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio
C
Hamano
Merge branch 'jk/filter-bra
n
ch-use-
o
f-sed
-
on
-
in
c
o
mplete
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C Hamano
Merge branch 'jc/daemon-
n
o-ipv6-for-2
.
4
.
1'
commit
|
commitdiff
|
tree
2015-05-11
J
unio C H
a
mano
M
erge br
a
nch
'
jn/
c
lean-
u
s
e-e
r
ror
-
not-fprintf-on-stderr
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hama
n
o
M
e
rg
e
branch
'
tb
/
blame-resurrect-conver
t
-to-git'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ha
m
an
o
Merge branch 'va
/
fix
-
git
-
p
4
-tests'
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
io C Ham
a
no
Merge branch 'ld/
p
4-case-f
o
ld
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge bran
c
h 'jk/rebase-quiet-noop
'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C Ha
m
ano
Merge bra
n
ch '
v
a/p4-
c
lient-pat
h
'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio
C
Hamano
Merge branc
h
'mm/add-p
-
split
-
error'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hama
n
o
Mer
g
e
b
ran
c
h 'tb
/
t0027-crl
f
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ham
a
no
Merge branch 'l
s
/p4-cha
n
ges
-
blo
c
k
-
s
i
ze'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Ham
a
n
o
Merge branch 'jc/plug
-
f
mt-
m
erge-m
s
g
-
le
a
k'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Haman
o
Merge bran
c
h 'nd/sl
i
m
-ind
e
x
-pa
c
k-memory-usage'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge bra
n
ch 'jk/still
-
interesti
n
g'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Hamano
M
e
rge branch 'jk/read
i
n
g
-packed-re
f
s
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
M
e
rge
b
ranch 'l
m
/squelch-bg-
p
r
o
gress'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge bran
c
h 'jk/s
h
a1-file-reduce-useless-wa
r
n
i
n
gs'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio
C Hamano
M
e
r
ge
b
ranch 'nd/multiple-work-trees'
commit
|
commitdiff
|
tree
2015-05-11
J
unio C
H
amano
Merge
bran
c
h 'pt/crede
n
tial-xdg'
commit
|
commitdiff
|
tree
2015-05-06
J
unio
C
Hamano
First
b
atch for 2
.
5 cy
c
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
Hamano
M
erge b
r
anch
'
jk/prun
e
-mtime'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Haman
o
Merge
b
ranch 'mm/us
a
ge-log-l-can-take-regex'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Haman
o
M
erge branch 'ep
/
fix-
t
est-lib-func
t
i
on
s
-report'
commit
|
commitdiff
|
tree
2015-05-06
Junio C
Hamano
Merg
e
branc
h
'cn/bom-in-gitignore'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Ha
m
ano
Merge branch 'jc/epochtime-wo-tz'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Ham
a
no
Merge bra
n
ch '
n
d/
t
1509
-
chroot-test'
commit
|
commitdiff
|
tree
2015-05-06
J
unio
C Hamano
Mer
g
e br
a
nch 'oh/fix-confi
g
-
d
efault-user-name-section'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge b
r
anch 'jk/typ
e
-from-s
t
ring-gen
t
ly'
commit
|
commitdiff
|
tree
2015-05-06
Junio C H
a
mano
Merge
bra
n
ch 'sb/test-b
i
tmap-free-
a
t-end'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hama
n
o
Merg
e
branch 'ld/p4-f
i
letype-detection'
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io
C
Hamano
Mer
g
e br
a
nch 'ts/c
h
e
c
kout
-
advice-plura
l
'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Ha
m
ano
M
erge branch 'j
k
/ini
t
-core-worktree-at-r
o
ot'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Mer
g
e branch
'
mh/show
-
branch-topic'
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C Haman
o
Merge branch 'sb/
l
ine-
l
og
-
plug-p
a
irdif
f
-leak'
commit
|
commitdiff
|
tree
2015-05-06
Junio C
Hamano
Merge branch
'jc
/
diff-no-index-d-f'
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io C H
a
mano
Me
r
ge branch 'bc/obj
e
ct
-
id'
commit
|
commitdiff
|
tree
2015-05-05
Ju
n
io
C
Hamano
daemon: unbre
a
k
N
O_IPV6 bui
l
d re
g
ression
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-05
J
unio C Hamano
write_sha1_file(): do no
t
u
s
e a separate
s
ha1[] arr
a
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-30
Junio C Hamano
Git 2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
Ha
m
an
o
merge:
de
p
re
c
a
t
e 'git merge <message>
H
E
AD
<commit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ham
a
no
merge: handle FET
C
H_
H
EAD i
n
terna
l
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hama
n
o
merge: de
c
ide if we a
u
to-generate
the mess
a
ge early
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ham
a
no
merge: ma
k
e collect_parents() auto-gene
r
ate the merge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C Hamano
merge: extract prepare_merge_message(
)
logic out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio C Hama
n
o
merge: narrow
s
co
p
e of merge_names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
me
r
ge: sp
l
it
r
edu
c
e_parents()
o
ut of collect_paren
t
s()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: c
l
a
rify colle
c
t_par
e
n
ts() logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
uni
o
C Hamano
merge: small l
e
akfix and c
o
de simplifica
t
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
me
r
ge: do not check argc to determine num
b
er
of r
e
mote
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: clarify "pulling into void" specia
l
case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
Hamano
t5520: test pullin
g
an octopus
into an unborn
b
ranch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Hamano
t5
5
20:
style
f
i
xes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ha
m
ano
m
e
r
ge: simp
l
ify co
d
e
flow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
i
o
C Hamano
m
erge:
t
est th
e
top-leve
l
me
r
ge driver
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Junio C
Ham
a
n
o
test: val
i
date pre
r
equistes syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Ju
n
io C Hamano
Merge branch '
m
h/mult
i
m
ail-renewa
l
'
commit
|
commitdiff
|
tree
2015-04-28
J
u
nio C Hamano
Me
r
ge b
r
anch 'mg/show
-
notes-doc'
commit
|
commitdiff
|
tree
2015-04-28
Junio
C
Hamano
Merge branc
h
'nd/versioncmp
-
prerele
a
ses'
commit
|
commitdiff
|
tree
2015-04-28
Junio C
Hamano
Merge
b
ranch 'mg/status-v-v'
commit
|
commitdiff
|
tree
2015-04-27
Junio C
H
am
a
no
Sync with 2
.
3
.
7
commit
|
commitdiff
|
tree
2015-04-27
J
unio C Hamano
G
i
t 2
.
3
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-27
Junio C Hamano
Merge branch 'tb/connec
t
-ipv6-p
a
rse-
f
ix' into maint
commit
|
commitdiff
|
tree
next