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: extract prepare_merge_message() logic out
2015-04-29
Junio C Ham
a
no
mer
g
e: extr
a
ct prepare
_
merge_message(
)
l
ogic
out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o C
Hamano
merge:
narrow
scope of merge_
n
ames
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Ham
a
no
m
e
rge: split re
d
uce_paren
t
s() out of collec
t
_parents
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io C Haman
o
me
r
ge: clar
i
f
y
c
o
l
lect_pare
n
t
s
(
) l
o
gic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Haman
o
m
erge: small leakfix a
n
d code simplifica
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio C Hamano
merge: do
n
ot check argc to d
e
termi
n
e number
o
f remote
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
amano
merge: c
l
arify "pullin
g
i
n
to vo
i
d" special case
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ham
a
no
t55
2
0: test pulli
n
g
an
o
ctopus into an unborn branch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
t
5520: st
y
le fixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
m
erge: simplify c
o
de
f
low
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C Ham
a
no
merge: test the
top-level mer
g
e driver
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-01-12
J
unio C Hamano
Git 2
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-01-12
Junio C
H
amano
Merge bra
n
ch 'jk
/
read-packed-refs-without-
p
ath-max
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Juni
o
C Hama
n
o
Merge
branch
'
mg
/
add-ignore-errors' in
t
o
m
a
int
commit
|
commitdiff
|
tree
2015-01-12
J
unio C Haman
o
Merge branch 'mh/find-uniq-a
b
bre
v
' i
n
to maint
commit
|
commitdiff
|
tree
2015-01-12
Junio C Hama
n
o
Me
r
ge branch '
j
k/approxidate-avoid-y-d-m-over-future
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio C Hamano
Merge branch
'rw/apply-do
e
s-not-take-
i
gnore-date' into
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio C H
a
ma
n
o
M
erge branch
'jk/f
o
r
-each-re
f
log-ent-rever
s
e
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2015-01-07
J
u
nio C Hamano
Me
r
ge branc
h
'maint-2
.
1
'
i
nto maint
commit
|
commitdiff
|
tree
2015-01-07
J
u
n
io C Ha
m
ano
Merg
e
b
ran
c
h
'
maint-2
.
0' into main
t
-2
.
1
commit
|
commitdiff
|
tree
2015-01-07
Junio C Hamano
Merge b
r
anch '
m
aint-1
.
9' into maint-
2
.
0
commit
|
commitdiff
|
tree
2015-01-07
Junio
C
H
a
mano
Merge branch
'
maint-1
.
8
.
5' into maint-1
.
9
commit
|
commitdiff
|
tree
2015-01-07
J
u
n
io C Hamano
Merge
b
ra
n
ch
'
j
k
/dotg
i
t
-
case-maint-1
.
8
.
5'
i
nto mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Jun
i
o C Hamano
Prepare for
2
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-22
Junio C Haman
o
Mer
g
e branc
h
'jk/rebuild-perl-sc
r
i
p
t
s
-with-no-perl
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Juni
o
C
Hama
n
o
Merge
branch 'jk/no-
p
erl-tests' into main
t
commit
|
commitdiff
|
tree
2014-12-22
Junio C Haman
o
Merge bra
n
ch 'po/everyday-doc'
i
n
to maint
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hama
n
o
Merge br
a
nch 'jk/pu
s
h-simple'
into maint
commit
|
commitdiff
|
tree
2014-12-22
Junio C Haman
o
Merge
b
ran
c
h 'mh/co
n
f
ig-fl
i
p-xbit
-
b
ack-after-checking
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Merge
bra
n
c
h
'jk/
g
itweb-wit
h
-
n
e
wer-cgi-
m
ulti-pa
r
a
m
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Merge branch 'rs/recei
v
e-pa
c
k-use-labs' into m
a
i
n
t
commit
|
commitdiff
|
tree
2014-12-22
Juni
o
C H
a
mano
Merge
b
ra
n
c
h 'rs/maint-conf
i
g-use-labs' into mai
n
t
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Merg
e
b
r
a
nch
'js/win
d
ows-
o
pen-e
i
sdir-error' into mai
n
t
commit
|
commitdiff
|
tree
2014-12-22
Junio C H
a
mano
Mer
g
e branch
'
j
k/colors-fix' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2014-12-22
Ju
n
io C H
a
mano
Merge
branc
h
'j
k
/checkout-from-t
r
ee' into maint
commit
|
commitdiff
|
tree
2014-12-17
Juni
o
C Ham
a
no
G
it
2
.
2
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Junio C
H
amano
Sync
w
i
th v2
.
1
.
4
commit
|
commitdiff
|
tree
2014-12-17
Junio C Hamano
Git
2
.
1
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
J
u
n
i
o
C Hamano
S
y
nc with v2
.
0
.
5
commit
|
commitdiff
|
tree
2014-12-17
Juni
o
C
Hamano
Git 2
.
0
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Junio C Hamano
Sync with v
1
.
9
.
5
commit
|
commitdiff
|
tree
2014-12-17
Junio C Hama
n
o
Git 1
.
9
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Junio C Hamano
S
y
nc with
v1
.
8
.
5
.
6
commit
|
commitdiff
|
tree
2014-12-17
Junio C Ham
a
no
Git 1
.
8
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Junio C Hama
n
o
Merge
branch 'd
o
tgit-case-maint
-
1
.
8
.
5
' into maint-1
.
8
.
5
commit
|
commitdiff
|
tree
2014-12-05
Junio C Hamano
Me
r
ge
branch 'maint' o
f
g
it://
g
ithub
.
com
/
gi
t
-l10n/g
i
t
.
.
.
commit
|
commitdiff
|
tree
2014-12-05
Junio
C Hamano
S
t
a
r
t post 2
.
2 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-26
Junio C Hamano
Git 2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-21
Junio C
H
amano
G
it 2
.
2
.
0-
r
c3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-19
Junio C Hamano
M
e
rge b
r
anch 'sv/submittin
g
-
f
inal-patch'
commit
|
commitdiff
|
tree
2014-11-19
Ju
n
io C Hamano
M
erge branch 'sn/
t
utorial-status-output-example'
commit
|
commitdiff
|
tree
2014-11-19
Junio
C Hama
n
o
Merg
e
b
ranc
h
'
mh/doc-remote-helper-
x
ref'
commit
|
commitdiff
|
tree
2014-11-19
Juni
o
C Hamano
M
e
rge
b
ranch 'tb/no-relativ
e
-
f
ile
-
url'
commit
|
commitdiff
|
tree
2014-11-19
Junio C H
a
mano
Merge
b
ranch
'
cc/interp
r
e
t
-trai
l
e
r
s'
commit
|
commitdiff
|
tree
2014-11-18
Junio C Ham
a
no
Merge
gi
t
://github
.
com/git-l10n/git-po
commit
|
commitdiff
|
tree
2014-11-18
Junio C
H
amano
Merge
branch 'jc/doc-commi
t
-only'
commit
|
commitdiff
|
tree
2014-11-18
Juni
o
C
H
amano
Merge b
r
anch '
t
a/tutorial
-
mo
d
e
rnize'
commit
|
commitdiff
|
tree
2014-11-18
Junio
C
H
a
m
ano
Merg
e
bran
c
h 'da
/
difftool'
commit
|
commitdiff
|
tree
2014-11-17
Juni
o
C Hamano
Merge branch
'
master'
of git:/
/
g
i
t
hub
.
co
m
/git-l10
n
.
.
.
commit
|
commitdiff
|
tree
2014-11-14
Junio C Hamano
Git 2
.
2
.
0
-
rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-12
Junio C Hamano
Updat
e
dr
a
ft release no
t
es to
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-12
Junio C Hamano
Sync wit
h
'
m
aint'
commit
|
commitdiff
|
tree
2014-11-12
J
u
nio C
Hamano
Merg
e
branch 'nd/gitignore-trailing-w
h
it
e
space' into
.
.
.
commit
|
commitdiff
|
tree
2014-11-12
Junio C Hamano
Merge branch 'jk/fetch-reflog-df-c
o
nflict'
commit
|
commitdiff
|
tree
2014-11-11
Junio C
H
a
m
a
no
Sync with maint
commit
|
commitdiff
|
tree
2014-11-11
Junio C Hamano
M
e
rge branch 'rs/clean-menu-item-defn
'
int
o
maint
commit
|
commitdiff
|
tree
2014-11-10
J
u
ni
o
C Ha
m
ano
M
e
rge branch 'master' of git://
g
ithub
.
com/git-l10
n
.
.
.
commit
|
commitdiff
|
tree
2014-11-10
Junio
C
H
a
mano
Sync with m
a
int
commit
|
commitdiff
|
tree
2014-11-10
Junio C
H
amano
Merge branch 'js/diff
-
highlight-avoid-sigp
i
pe'
commit
|
commitdiff
|
tree
2014-11-07
Junio C Hamano
Git 2
.
2
.
0-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-07
Junio
C Hama
n
o
Documentation/git-co
m
mit: clarif
y
that --on
l
y/--include
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-06
Junio
C
Hamano
Merg
e
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2014-11-06
Junio C H
a
mano
Mer
g
e branch 'nd/g
i
tigno
r
e-trailing
-
whites
p
ace'
commit
|
commitdiff
|
tree
2014-11-06
Junio C H
a
mano
Merge branch 'tm/line-l
o
g
-
fir
s
t-parent'
commit
|
commitdiff
|
tree
2014-11-06
Junio C Hamano
Merge br
a
n
c
h 'jk/fetch-reflog-df-conflict'
commit
|
commitdiff
|
tree
2014-11-06
Junio
C Hama
n
o
Merge
b
r
anch 'rs/
u
se-chil
d
-
p
r
o
ces
s
-
i
nit-more'
commit
|
commitdiff
|
tree
2014-11-06
Junio C Hamano
Merge b
r
anch 'jk/cache-tre
e
-prot
e
ct-
f
rom
-
br
o
ken-libgit2'
commit
|
commitdiff
|
tree
2014-10-31
Junio C H
a
mano
Gi
t
2
.
2
.
0-rc0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-31
J
u
n
i
o
C Hamano
Merge b
r
a
nch 'for-junio' of git://bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2014-10-31
Junio C Ha
m
ano
M
er
g
e
b
r
anch 'jc/push-cert'
commit
|
commitdiff
|
tree
2014-10-31
Junio C
Hamano
Merge branch 'rs/c
h
ild-process-init'
commit
|
commitdiff
|
tree
2014-10-31
Junio C Ha
m
ano
Merge
branch
'
rs/g
r
e
p
-color-wor
d
s
'
commit
|
commitdiff
|
tree
2014-10-30
J
unio C Hamano
bundle: split
out a helper func
t
ion to compute and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-30
Jun
i
o C Hamano
bundle: spli
t
o
ut
a
h
e
lper functio
n
to creat
e
pack
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-30
Jun
i
o
C
Ham
a
no
M
e
r
g
e git://ozlabs
.
org/~paulus/gi
t
k
commit
|
commitdiff
|
tree
2014-10-29
Juni
o
C
H
a
m
a
no
Sync with G
i
t
2
.
1
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-29
Junio
C
Hama
n
o
Git 2
.
1
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-29
Junio C
Haman
o
Mer
g
e bran
c
h 'jk/pack-o
b
jects-no-bitma
p
-when-splittin
g
.
.
.
commit
|
commitdiff
|
tree
2014-10-29
Junio C Hamano
Merge branc
h
'da/mergetool-meld
'
into main
t
commit
|
commitdiff
|
tree
2014-10-29
Ju
n
i
o
C
H
amano
Me
r
ge bran
c
h 'rm/gitweb
-
start-
f
orm' int
o
ma
i
n
t
commit
|
commitdiff
|
tree
2014-10-29
Junio C Ham
a
n
o
Merge
bran
c
h 'bc/asciidoc
-
pretty-f
o
rmats-fix' into
.
.
.
commit
|
commitdiff
|
tree
2014-10-29
Junio C Hamano
Merge bran
c
h 'rs/d
a
e
m
on-
f
i
x
es' int
o
maint
commit
|
commitdiff
|
tree
2014-10-29
Juni
o
C Hama
n
o
Updat
e
draft release no
t
es
to 2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-29
Jun
i
o C Ha
m
ano
Merge branch 'da/di
f
ftool'
commit
|
commitdiff
|
tree
2014-10-29
Jun
i
o C Hamano
Merge branch 'rb/
p
a
ck-window-memory-config-doc'
commit
|
commitdiff
|
tree
2014-10-29
Junio C Hama
n
o
Merge bran
c
h
'
m
g/li
b
-gp
g
-ro-saf
e
t
y
'
commit
|
commitdiff
|
tree
2014-10-29
Junio C Hamano
Merge br
a
n
ch
'dm/port2zos'
commit
|
commitdiff
|
tree
2014-10-29
J
u
n
i
o C H
a
m
ano
Mer
g
e bra
n
ch 'oc/m
e
rget
o
ols-beyondcompa
r
e'
commit
|
commitdiff
|
tree
2014-10-29
Junio C Hamano
M
erge branch 'jk/prune-mtime'
commit
|
commitdiff
|
tree
2014-10-29
Junio C Ham
a
no
Merg
e
branch 'bc/as
c
iidoctor'
commit
|
commitdiff
|
tree
next