repo.or.cz
/
alt-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 'dl/subtree-avoid-tricky-echo'
2015-05-22
Junio C Haman
o
Merge b
r
a
n
c
h '
d
l/subtree-avoid-tr
i
c
k
y-echo
'
commit
|
commitdiff
|
tree
2015-05-22
Ju
n
io C Hamano
Merg
e
branch 'jk/skip-h
t
tp-tests-under
-
no-curl
'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Ham
a
no
Merge branch 'dl/subtree-p
u
sh-
n
o-squash
'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hamano
Merge br
a
nch
'
sg/co
m
pletion-o
m
i
t
-cre
d
ential-helpers
'
commit
|
commitdiff
|
tree
2015-05-22
J
u
n
i
o C Hamano
Merge branch 'd
l
/branch-error-message'
commit
|
commitdiff
|
tree
2015-05-19
Junio
C
Hamano
Third
batch for 2
.
5
c
ycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-19
Ju
n
io C Haman
o
Merge branch '
s
b/ref
-
lock-lose-lock-fd'
commit
|
commitdiff
|
tree
2015-05-19
Juni
o
C Hamano
Merge
bran
c
h
'kn/cat-f
i
le-
l
itera
l
ly'
commit
|
commitdiff
|
tree
2015-05-19
Juni
o
C Ham
a
no
Merge branch 'nd/dwim-wil
d
ca
r
d
s
-as-pathspecs'
commit
|
commitdiff
|
tree
2015-05-19
Ju
n
io C Hamano
Merge br
a
nch 'j
c
/
merge'
commit
|
commitdiff
|
tree
2015-05-19
Junio
C
Hamano
Merge br
a
nc
h
'ph/rebase-i-
r
edo'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge branch 'jc/tes
t
-
p
r
ereq-validat
e
'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Ha
m
ano
Merge
b
ra
n
ch
'
b
c
/connect-plink
'
commit
|
commitdiff
|
tree
2015-05-19
Jun
i
o C
H
ama
n
o
M
erge br
a
nch 'jk
/
tes
t
-
c
hai
n
-lint'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge branch 'fg
/
docu
m
ent-commit-message-
s
tr
i
p
ping'
commit
|
commitdiff
|
tree
2015-05-19
Junio
C H
a
ma
n
o
M
e
rge branch 'jk/stash-requi
r
e-cl
e
an-
i
ndex'
commit
|
commitdiff
|
tree
2015-05-19
J
unio C Hamano
Merge
branch
'jk/gi
t
-n
o
-
more-argv0-path-mung
i
ng'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge branch 'jc/gitignore
-
precedence'
commit
|
commitdiff
|
tree
2015-05-19
Junio C H
a
m
a
no
Merge 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
Junio
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 br
a
nch 'sb/line
-
log-plug
-
p
airdiff-le
a
k' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
Merg
e
br
a
nch 'sb/test-
b
itm
a
p
-free-at-end' into maint
commit
|
commitdiff
|
tree
2015-05-13
J
u
n
io C H
a
mano
Merge branc
h
'nd/t1
5
09-c
h
r
o
ot-t
e
st' into maint
commit
|
commitdiff
|
tree
2015-05-13
Juni
o
C Hamano
Merge b
r
anc
h
'jk/type
-
from-s
t
ring-gently' into maint
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
Merge branch 'ep/fix-test-lib-functions-
r
e
port' int
o
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Junio
C Hamano
Merge branch 'c
n
/
bom-in-
g
i
ti
g
n
o
re'
i
nto maint
commit
|
commitdiff
|
tree
2015-05-13
Junio C H
a
mano
Merge
b
ranch
'
jk/prune-mtime
'
i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
Merge
b
r
anch 'j
k
/init-c
o
re-worktr
e
e-at
-
roo
t
' int
o
maint
commit
|
commitdiff
|
tree
2015-05-11
J
unio C Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
H
ama
n
o
Sy
n
c with 2
.
3
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Hamano
G
i
t 2
.
3
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ha
m
ano
Merge branch 'mm/
u
sage-log-l-can-t
a
ke-regex
'
into maint-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C Haman
o
Merge branch 'jc/d
i
ff-no-index-d-f'
i
nto m
a
int
-
2
.
3
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C Hamano
Merge bra
n
ch 'oh/fix-config-default
-
user-
n
ame-sec
t
i
on
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C Haman
o
M
erg
e
branch 'jc/e
p
o
chti
m
e-w
o
-tz' into maint-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio C
Hama
n
o
Second
batch for 2
.
5 cyc
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C Hamano
Merg
e
bra
n
ch 'pt/xdg-config-path'
commit
|
commitdiff
|
tree
2015-05-11
J
u
ni
o
C Hamano
Merge
b
ranch 'ep/do
-
not-feed-a
-
pointer-to-array-size'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
aman
o
Merge branch '
j
c/hash-ob
j
ec
t
'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C Hamano
Merge branch 'sb/p
r
efix-path-f
r
ee-re
s
ults'
commit
|
commitdiff
|
tree
2015-05-11
J
unio C H
a
m
an
o
Merge bran
c
h 'sg/completion-no-redundant
-
all
-
command
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio
C Hamano
Merge branch 'sg
/
complete-decorate-fu
l
l-not-lo
n
g'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Mer
g
e branc
h
'
j
k
/
f
ilter-br
a
nch-use-o
f
-sed-
o
n
-
incomplete
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
M
erge branch 'j
c
/daemon-no-ipv6-for-2
.
4
.
1
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge b
r
anch 'jn/cle
a
n-use
-
error-not
-
fprin
t
f-on-stde
r
r
'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C Hamano
Merge branc
h
't
b
/blame-resurrec
t
-
convert-t
o
-
git
'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio
C Hamano
M
erge branc
h
'
v
a/fix-git-p
4
-tests'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge
bran
c
h 'ld/p4-case-fold'
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C Hamano
M
e
rge br
a
nch 'jk/r
e
b
a
se-quie
t
-noop
'
commit
|
commitdiff
|
tree
2015-05-11
J
un
i
o C Hamano
Merge bran
c
h 'va/
p
4-client-path'
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C Hamano
Me
r
ge
b
ranch 'mm/add-p-spl
i
t-error'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Me
r
ge branch 'tb/t0027-crlf
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
M
erge
br
a
nch 'ls/p4-changes-bloc
k
-size'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
Hamano
Merge branch 'jc/p
l
ug-fmt-merge-
m
sg-leak'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Mer
g
e branch 'nd/sli
m
-index-p
a
c
k-mem
o
ry
-
usag
e
'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C Hamano
Merge bran
c
h
'jk/still-intere
s
tin
g
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hama
n
o
Merge branch 'jk
/
re
a
di
n
g
-pack
e
d-refs'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ha
m
ano
Merge bra
n
ch
'lm/
s
quelch-bg-pr
o
gress'
commit
|
commitdiff
|
tree
2015-05-11
J
unio C Hamano
Merge
b
r
anch 'jk/sha
1
-file
-
re
d
uce
-
u
s
eless-warn
i
ngs'
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o
C Ha
m
ano
Merge branch 'nd/
m
ultiple-work-trees'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Me
r
ge
bran
c
h 'pt/cre
d
ential-xdg
'
commit
|
commitdiff
|
tree
2015-05-07
Junio
C Hamano
tests:
ski
p
d
av ht
t
p-push te
s
ts under
N
O_EXP
A
T=NoT
h
an
k
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o C Hamano
Firs
t
ba
t
ch
for 2
.
5 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge bran
c
h 'jk/prune-mti
m
e'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C Hamano
Merge
bra
n
ch 'mm/us
a
ge-log-l-can-
t
ake-r
e
ge
x
'
commit
|
commitdiff
|
tree
2015-05-06
Junio C
H
amano
Mer
g
e branc
h
'
e
p/fix-test-
l
ib-fun
c
tions-report
'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
Hamano
Merge branch 'c
n
/bom-in-git
i
gnore'
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C Hamano
Merge branch 'jc/epoc
h
time-wo-tz'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
M
e
rge br
a
nch '
n
d/t1509
-
chroot-test'
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C Ham
a
no
Merge
branch 'oh/f
i
x-conf
i
g-d
e
fault-us
e
r-name-s
e
ction'
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io
C
H
a
mano
Merge bran
c
h 'jk/type-from
-
s
t
ring-gent
l
y'
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io C
H
amano
Me
r
ge bran
c
h 'sb
/
test
-
bitmap-free-at-e
n
d'
commit
|
commitdiff
|
tree
2015-05-06
Junio C
Hamano
Merge branch 'ld/p4-
f
iletype-d
e
tectio
n
'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C Hamano
Mer
g
e
b
ranch '
t
s/checkout-ad
v
ice-plural'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Ham
a
no
Merge branch 'jk/init-core
-
worktree-at
-
root'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hama
n
o
Merge branch
'
mh/s
h
o
w
-branch-topic'
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io C Ha
m
ano
Merge branch 'sb/li
n
e-log-plug-pairdiff-leak'
commit
|
commitdiff
|
tree
2015-05-06
Junio C
H
a
m
ano
Mer
g
e
branc
h
'j
c
/
d
iff-no-index-
d
-f'
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C Hama
n
o
Merge branch 'bc/obj
e
ct-id'
commit
|
commitdiff
|
tree
2015-05-05
Juni
o
C H
a
mano
d
aemon: unbreak NO_
I
PV6 bu
i
l
d
regression
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-05
Jun
i
o C Hamano
w
r
ite_sh
a
1
_file(): do not
u
se a separate sha1[] array
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-30
Junio C H
a
mano
Gi
t
2
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C H
a
mano
merge: dep
r
ecate 'gi
t
merge <message>
H
EA
D
<comm
i
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Hama
n
o
merge
:
handle FET
C
H_HEAD internally
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hama
n
o
me
r
ge: decide if we
auto
-
genera
t
e the message ea
r
ly
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C Ha
m
an
o
merge
:
ma
k
e collect_parents
(
) auto
-
generat
e
the mer
g
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
u
n
io C Hamano
mer
g
e:
ext
r
act prepare_merge_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
merge
:
n
a
rrow scope of
m
erge_names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Haman
o
me
r
ge: split
r
e
d
uce_
p
arent
s
() ou
t
of col
l
ect_parents()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C Ha
m
ano
m
e
r
ge: clarify
collect_parents()
l
ogic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
unio C H
a
m
a
n
o
merg
e
:
s
ma
l
l lea
k
fix and code s
i
mpl
i
fic
a
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C Haman
o
m
erge: do not
c
h
eck argc to d
e
termine number of
r
emote
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C Hamano
m
erge:
c
l
a
r
ify
"pulling into vo
i
d" specia
l
case
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
un
i
o C
H
amano
t5520
:
tes
t
pulling
an octopus
i
nto an
u
nborn branch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C Hamano
t5520: style
f
i
x
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
uni
o
C Hamano
merge: simplify
co
d
e flow
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio
C
Ham
a
no
merge:
test the t
o
p
-leve
l
merge driver
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-28
Junio C Hamano
test:
v
alidate prerequ
i
stes
synta
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-28
Junio C
Hamano
Me
r
ge branch 'mh/multimail-renewal'
commit
|
commitdiff
|
tree
next