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 'jc/merge'
2015-05-19
J
u
nio C Hamano
Merg
e
bran
c
h 'jc/merge'
commit
|
commitdiff
|
tree
2015-05-19
Jun
i
o
C
Hamano
Merge branch
'
ph/rebas
e
-i-redo'
commit
|
commitdiff
|
tree
2015-05-19
Ju
n
i
o
C Hamano
Merg
e
bra
n
ch 'jc/test-prereq-validate'
commit
|
commitdiff
|
tree
2015-05-19
J
u
nio C
Hama
n
o
Merge branch
'
bc/connect-pli
n
k'
commit
|
commitdiff
|
tree
2015-05-19
Junio
C
Hamano
Merge branch 'jk/tes
t
-chain-lin
t
'
commit
|
commitdiff
|
tree
2015-05-19
J
u
nio
C
Hamano
Merg
e
b
r
anch 'f
g
/document-commit
-
m
e
ssag
e
-stripping'
commit
|
commitdiff
|
tree
2015-05-19
J
u
nio C H
a
man
o
Me
r
ge branch 'jk/
s
tash-require-clean-inde
x
'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge
branch 'jk/git-no-more-argv
0
-
p
ath-munging'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hama
n
o
Merge branch 'jc/gitign
o
re
-
precedence'
commit
|
commitdiff
|
tree
2015-05-19
J
unio C Hama
n
o
M
e
rg
e
b
ra
n
ch 'nd/diff-
i
-t-a
'
commit
|
commitdiff
|
tree
2015-05-13
J
unio C
H
amano
S
ync wi
t
h 2
.
4
.
1
commit
|
commitdiff
|
tree
2015-05-13
J
unio 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
Mer
g
e
branch '
s
b/line-log
-
plu
g
-pairdiff
-
leak' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Junio
C
Ha
m
an
o
M
e
rge branch '
s
b/test-b
i
tmap-fre
e
-
at-end' into maint
commit
|
commitdiff
|
tree
2015-05-13
Jun
i
o C
H
am
a
no
M
e
rge branc
h
'nd
/
t
1
509-chroot-test' into maint
commit
|
commitdiff
|
tree
2015-05-13
Junio C
H
amano
Merge branc
h
'
j
k
/type-fr
o
m
-s
t
ring-gently' into maint
commit
|
commitdiff
|
tree
2015-05-13
Junio C
H
amano
Merge branch 'e
p
/
f
i
x
-test-l
i
b-f
u
nctions-report' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
J
u
nio
C Hamano
Merge branch 'cn/bom-in-gitigno
r
e
'
into maint
commit
|
commitdiff
|
tree
2015-05-13
Junio C H
a
mano
Merge branc
h
'jk/p
r
une-mt
i
me' into maint
commit
|
commitdiff
|
tree
2015-05-13
Junio
C
Hamano
M
erge bran
c
h 'jk/init-cor
e
-
w
orktr
e
e-at-roo
t
' into maint
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C
Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Sync with 2
.
3
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Git 2
.
3
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C
H
a
m
ano
Merge branch 'mm/usage-log-
l
-
can-take-regex' into ma
i
nt
-
2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C Hamano
M
erge bra
n
c
h 'jc/diff-no-index-d-f' in
t
o maint-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C
H
amano
Me
r
ge
branch
'
oh/fix-config-default-use
r
-name-section
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'jc/epoch
t
ime-wo-tz' i
n
t
o
mai
n
t-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Hamano
S
e
cond
batch for 2
.
5 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Me
r
ge branch 'pt/xdg
-
confi
g
-
p
ath'
commit
|
commitdiff
|
tree
2015-05-11
J
unio C Hamano
Merge br
a
nch
'
ep/d
o
-not-feed-a-pointe
r
-to-a
r
ray-siz
e
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
amano
Me
r
ge b
r
anch 'jc/hash-object'
commit
|
commitdiff
|
tree
2015-05-11
J
unio C Hamano
Merge branch 's
b
/p
r
e
f
ix-path-free-results'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merg
e
branch
's
g
/completion-no-r
e
dundant
-
all-comm
a
nd
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Haman
o
Merge br
a
n
c
h 'sg/comple
t
e-deco
r
ate-full-not-long'
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
io C Hamano
Merge branch 'jk/filte
r
-
br
a
nch-us
e
-of-
s
e
d
-
o
n
-
incomplete
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C
Hamano
Merge branch 'jc
/
dae
m
on-n
o
-ipv6-for-2
.
4
.
1'
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C Hamano
Merg
e
branch '
j
n/clean
-
use-
e
rror-n
o
t-fprintf-
o
n-stderr'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hama
n
o
M
erge branch
't
b
/blame-res
u
rrect-convert-to-git'
commit
|
commitdiff
|
tree
2015-05-11
J
unio C Haman
o
Me
r
ge bran
c
h 'va
/
fix-git-p4-test
s
'
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
io C Hamano
Merge branch 'ld/p4-ca
s
e-fold'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
Hamano
Merge bra
n
ch 'j
k
/rebase-quiet-noo
p
'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Hamano
Merge b
r
anch 'va/p4-client-p
a
th'
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C Ham
a
n
o
Mer
g
e branch
'
m
m
/add-p-s
p
l
i
t-error'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge b
r
anch 'tb
/
t0
0
27-cr
l
f
'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Hamano
Merge bran
c
h 'l
s
/p4-chan
g
es-block-size'
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
io C
H
amano
Mer
g
e branch 'jc/plug-fmt-m
e
rge-msg-leak'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ha
m
ano
Merg
e
branch 'nd/slim-ind
e
x-p
a
ck-memory-usage'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ham
a
no
Merge branch '
j
k
/
st
i
ll-interesting'
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C Haman
o
Merge branch 'jk/rea
d
ing-packed-refs'
commit
|
commitdiff
|
tree
2015-05-11
J
unio C Hamano
Merge br
a
nch 'lm/sq
u
e
l
ch-bg
-
progress
'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Hamano
Merge branch
'
j
k
/sha1-file
-
reduce-usel
e
ss
-
w
arnin
g
s'
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o
C Hamano
M
e
rge branch '
n
d
/
multiple-
w
ork-tr
e
es'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
ama
n
o
Merge bran
c
h 'p
t
/cr
e
dential
-
xdg'
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io C
H
a
mano
F
irst
batch for 2
.
5 cycl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io C Haman
o
Merge br
a
nch 'jk/prune-mti
m
e'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
H
a
mano
Merge branch 'mm
/
usage-l
o
g-l-
c
a
n-
t
ake-regex'
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o
C Hamano
Merge bra
n
ch 'ep/fix-test-lib-
f
unctions-report'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge branch
'cn/bom-in-gitignore'
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C H
a
mano
Merge b
r
an
c
h 'jc/epoch
t
ime-
w
o-tz'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Mer
g
e branch 'nd/t1
5
09-ch
r
oo
t
-test'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge branch 'o
h
/fix-config-default-user-name-section'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Ha
m
ano
M
erge branch 'jk/type-from-
s
tr
i
ng-g
e
n
tly'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
Hamano
Merge bran
c
h
'sb/
t
est
-
bit
m
a
p
-fre
e
-at-e
n
d'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Mer
g
e b
r
anch '
l
d/p4-fi
l
etyp
e
-d
e
tection'
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
i
o
C Ham
a
no
Me
r
ge bran
c
h '
t
s
/checkout-ad
v
ice-pl
u
ral'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge
b
ranc
h
'jk/i
n
i
t
-co
r
e-work
t
ree-at-root'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Haman
o
Mer
g
e branch
'
mh/show
-
bra
n
ch-to
p
ic'
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o C Hamano
Merge branch 'sb/
l
ine-log-p
l
ug-pairdiff-leak'
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o C Hamano
Merge
b
ranch 'jc/diff-no-inde
x
-
d
-f'
commit
|
commitdiff
|
tree
2015-05-06
J
unio C H
a
mano
M
erge b
r
a
n
ch 'bc/object-id'
commit
|
commitdiff
|
tree
2015-05-05
Junio C Hamano
daemon: unbreak NO_IPV
6
build reg
r
essi
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-05
Junio
C Ha
m
ano
w
rite_sha1
_
file(): do not use a separate s
h
a1[] array
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
Ju
n
io C Hamano
merge: deprecate
'
g
i
t
m
e
r
ge <message
>
HEA
D
<commit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io C Hamano
merge: handl
e
FETCH
_
HEAD i
n
ternally
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ha
m
an
o
mer
g
e: decide i
f
we auto-genera
t
e t
h
e mess
a
g
e early
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C H
a
mano
merge: m
a
ke
co
l
lect
_
par
e
n
t
s
() auto-generate th
e
merge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
Hamano
merg
e
:
e
xtra
c
t prepare_m
e
rge_message() lo
g
ic out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ham
a
no
m
erg
e
: n
a
rro
w
sc
o
pe of m
e
rge_names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Hamano
merge: split red
u
c
e
_pare
n
t
s() out of c
o
llect_
p
are
n
ts
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio C
H
amano
mer
g
e
:
c
l
arify collect_parents() logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
i
o C Hamano
merge: small lea
k
fi
x
and
code simp
l
i
fication
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merg
e
: do not check argc to
d
etermine numb
e
r of
r
emote
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C H
a
m
a
n
o
merge: clarify "pull
i
n
g i
n
to void" sp
e
cial case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
t5520: test pulling
a
n octopus into
a
n
unborn branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hama
n
o
t
5
520: style fixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
unio C Ha
m
ano
merge: simplify code flow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
H
a
m
ano
m
e
rge: test the
t
op-le
v
el
merge driver
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Juni
o
C Hamano
test: va
l
idate prerequistes synt
a
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Jun
i
o
C
Hamano
Merge branch 'mh/multimai
l
-r
e
newal'
commit
|
commitdiff
|
tree
2015-04-28
J
u
nio C H
a
mano
Me
r
ge branch 'mg/show
-
notes-d
o
c'
commit
|
commitdiff
|
tree
2015-04-28
J
unio
C
Hamano
Mer
g
e bra
n
ch '
n
d/
v
ersioncmp-prere
l
e
a
s
es'
commit
|
commitdiff
|
tree
2015-04-28
Jun
i
o C H
a
mano
Mer
g
e branch 'mg/status-v
-
v'
commit
|
commitdiff
|
tree
2015-04-27
Junio
C
Hamano
Sync with 2
.
3
.
7
commit
|
commitdiff
|
tree
2015-04-27
Ju
n
io C Ha
m
ano
Gi
t
2
.
3
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-27
Jun
i
o C
Hamano
Merge branch 'tb/connect-ipv6-parse-fix' i
n
t
o maint
commit
|
commitdiff
|
tree
2015-04-27
Junio
C H
a
mano
M
erge br
a
nch 'ma
/
bash-comple
t
ion-leakin
g
-x' into main
t
commit
|
commitdiff
|
tree
2015-04-27
Junio C Haman
o
Merge branch 'jc/pus
h
-ce
r
t
' into maint
commit
|
commitdiff
|
tree
2015-04-22
Junio C
H
amano
ign
o
r
e
: info/exclud
e
s
hould trump core
.
e
x
cludesfile
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-22
Juni
o
C
H
amano
Git
2
.
4
.
0-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next