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: extract prepare_merge_message() logic out
2015-04-29
Jun
i
o C Hamano
merge:
e
x
tract prepare_merge
_
m
e
ssag
e
(
)
logic out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C Hama
n
o
merge: narrow sc
o
pe of merge_names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io
C Hamano
m
erge: split reduce
_
parent
s
() out of collect_parents()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
n
i
o C Hamano
merg
e
: cla
r
ify collect_parents() logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io C Hamano
merge: smal
l
le
a
kfix and code si
m
plificat
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C H
a
mano
merge:
d
o n
o
t che
c
k argc
t
o
determin
e
nu
m
b
e
r of
r
e
mote
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio
C
Ha
m
ano
me
r
ge
:
clarify "pulling into void" speci
a
l case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ham
a
n
o
t5520: test pulling an octopus into
a
n unb
o
rn b
r
anc
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
t
5520: style
f
ix
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: simpli
f
y code
f
l
o
w
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ha
m
ano
m
e
rge: test the
t
op-level merge
d
river
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-01-12
Junio C
H
amano
Git 2
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-01-12
Ju
n
io C Hamano
Merge branch 'jk/
r
ead-p
a
cked-refs-without-path-max
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio C Hamano
Merge
b
ranch 'mg/add-ignor
e
-e
r
rors' into maint
commit
|
commitdiff
|
tree
2015-01-12
Junio
C Hamano
Merge b
r
anch 'mh
/
find-uniq-abbre
v
' into maint
commit
|
commitdiff
|
tree
2015-01-12
Junio C Hamano
Merge branch 'j
k
/approxidate-a
v
o
i
d-y-d-m-over-futu
r
e
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio
C
Ha
m
ano
Merg
e
b
r
anch 'rw
/
ap
p
ly
-
does-not
-
take-ig
n
ore-date' into
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio C Hamano
Merge bra
n
c
h 'jk/
f
o
r-each-reflog-e
n
t-re
v
ers
e
' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-01-07
Junio C Hamano
Merge bra
n
c
h
'maint-
2
.
1' in
t
o maint
commit
|
commitdiff
|
tree
2015-01-07
Ju
n
io C
H
a
mano
Merge
b
r
a
nch 'maint-2
.
0' in
t
o mai
n
t-2
.
1
commit
|
commitdiff
|
tree
2015-01-07
Juni
o
C Hamano
Merg
e
b
ranch 'maint-1
.
9' i
n
to
maint-2
.
0
commit
|
commitdiff
|
tree
2015-01-07
Junio C Hamano
Mer
g
e
b
ranch 'm
a
int-
1
.
8
.
5' into maint-1
.
9
commit
|
commitdiff
|
tree
2015-01-07
Ju
n
io
C Hamano
Merge br
a
n
ch 'jk/dotg
i
t-case
-
maint-
1
.
8
.
5'
i
nto
m
aint
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
P
r
epare
f
or 2
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-22
J
uni
o
C
H
a
mano
Me
r
ge bra
n
c
h
'jk/rebuild-perl-s
c
ript
s
-with-n
o
-perl
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Junio C
Hamano
Merg
e
b
ranch 'j
k
/no-perl-tests' into mai
n
t
commit
|
commitdiff
|
tree
2014-12-22
Junio C Ham
a
no
Me
r
ge bra
n
ch 'po/
e
veryda
y
-doc' into maint
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
M
e
rge
b
ranch
'
j
k/push-simple' into ma
i
nt
commit
|
commitdiff
|
tree
2014-12-22
Junio
C
H
amano
Merge branch 'm
h
/config-
f
lip-xbit-back-
a
fter-checking
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Merge branch 'jk/gitwe
b
-with-ne
w
e
r-
c
gi-multi-param
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Merge branch 'rs/rece
i
v
e-pa
c
k-use-l
a
bs' into maint
commit
|
commitdiff
|
tree
2014-12-22
J
u
nio C H
a
man
o
M
e
rge branch 'rs/main
t
-config-us
e
-la
b
s' into maint
commit
|
commitdiff
|
tree
2014-12-22
J
unio C Hama
n
o
Mer
g
e branch
'js/wi
n
d
ows-open-eisdir-er
r
or' into maint
commit
|
commitdiff
|
tree
2014-12-22
Junio C
H
am
a
no
Merge branch '
j
k/colo
r
s-fix'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2014-12-22
Juni
o
C Hamano
Merge
branch 'jk/
c
heckout-from-tre
e
' into mai
n
t
commit
|
commitdiff
|
tree
2014-12-17
Junio C Hamano
Git 2
.
2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Juni
o
C Hamano
Sync with v2
.
1
.
4
commit
|
commitdiff
|
tree
2014-12-17
J
u
n
i
o C Hamano
G
it 2
.
1
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Ju
n
i
o
C Hamano
Syn
c
with v2
.
0
.
5
commit
|
commitdiff
|
tree
2014-12-17
Jun
i
o
C
H
amano
Git 2
.
0
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Junio
C
Ham
a
no
S
y
n
c
with v1
.
9
.
5
commit
|
commitdiff
|
tree
2014-12-17
Junio C Hamano
G
it
1
.
9
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Ju
n
i
o
C
Haman
o
Sync with v1
.
8
.
5
.
6
commit
|
commitdiff
|
tree
2014-12-17
Junio
C
H
ama
n
o
G
i
t 1
.
8
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Junio C Hamano
Merge
b
ra
n
c
h 'd
o
tgit-case
-
maint-1
.
8
.
5
' into m
a
i
n
t-1
.
8
.
5
commit
|
commitdiff
|
tree
2014-12-05
J
u
ni
o
C Hamano
Merge br
a
nch 'maint' of git://github
.
c
o
m/git-l10n
/
g
it
.
.
.
commit
|
commitdiff
|
tree
2014-12-05
Junio C Hamano
S
t
art post 2
.
2 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-26
Junio C
H
amano
Git
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-21
Ju
n
i
o
C Hama
n
o
Git 2
.
2
.
0
-
r
c
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-19
Junio
C
Hamano
Merge
b
r
an
c
h 's
v
/su
b
mittin
g
-f
i
na
l
-patch'
commit
|
commitdiff
|
tree
2014-11-19
Jun
i
o C Hamano
Merge br
a
nch 'sn/tutorial-sta
t
u
s-ou
t
p
u
t
-example'
commit
|
commitdiff
|
tree
2014-11-19
Ju
n
io
C
Ham
a
no
Merge
b
r
anch 'mh
/
doc-
r
em
o
te-
h
elper-xref'
commit
|
commitdiff
|
tree
2014-11-19
Ju
n
io C
H
amano
Merge branch 'tb
/
no-re
l
ative
-
file-url'
commit
|
commitdiff
|
tree
2014-11-19
Junio C Hamano
M
erge branch '
c
c/interp
r
et-trailers'
commit
|
commitdiff
|
tree
2014-11-18
J
unio C Ha
m
ano
M
erge git://github
.
co
m
/git-
l
10n/
g
it-po
commit
|
commitdiff
|
tree
2014-11-18
Junio C
H
amano
Merge
branch 'jc/doc
-
c
ommit-only'
commit
|
commitdiff
|
tree
2014-11-18
Jun
i
o C H
a
man
o
Merge branch 'ta/tu
t
orial-
m
o
d
ernize'
commit
|
commitdiff
|
tree
2014-11-18
Junio C Hamano
M
e
rge branch
'da/diffto
o
l'
commit
|
commitdiff
|
tree
2014-11-17
Junio C Hamano
Merge
b
ranc
h
'master' of git://github
.
com/g
i
t-l10n
.
.
.
commit
|
commitdiff
|
tree
2014-11-14
Junio C Hama
n
o
Git 2
.
2
.
0-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-12
Juni
o
C
Hamano
U
pd
a
te
d
r
a
ft rel
e
a
s
e notes to 2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-12
Junio C Hamano
Sync with '
m
aint'
commit
|
commitdiff
|
tree
2014-11-12
Junio
C Ham
a
n
o
Merge
branch
'
nd/git
i
gnore-t
r
ailing-whitespa
c
e' into
.
.
.
commit
|
commitdiff
|
tree
2014-11-12
Junio C Haman
o
Merge br
a
nch '
j
k/fetch-ref
l
og-
d
f-conflict'
commit
|
commitdiff
|
tree
2014-11-11
Juni
o
C
Ha
m
a
n
o
Sy
n
c with maint
commit
|
commitdiff
|
tree
2014-11-11
J
u
nio
C
Hamano
Merge branch 'rs/cl
e
an-menu-
i
tem-
d
e
fn' into maint
commit
|
commitdiff
|
tree
2014-11-10
Jun
i
o C Hamano
Merge bra
n
ch 'master' of git://github
.
com/git-l10n
.
.
.
commit
|
commitdiff
|
tree
2014-11-10
J
u
n
i
o C Hamano
Sync with
maint
commit
|
commitdiff
|
tree
2014-11-10
Junio C Haman
o
Merg
e
branc
h
'
j
s/diff-highlight-
a
vo
i
d-sigpipe'
commit
|
commitdiff
|
tree
2014-11-07
Junio C Hamano
Git 2
.
2
.
0-rc
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-07
Juni
o
C
Haman
o
Do
c
um
e
ntation/git-commit
:
clarif
y
that --
o
nly/
-
-
include
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-06
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2014-11-06
Juni
o
C Hamano
Merge br
a
nch 'nd/gitig
n
o
r
e
-trailing-whitesp
a
ce'
commit
|
commitdiff
|
tree
2014-11-06
Junio
C
Haman
o
Merge branch
'
tm/
l
ine-log-first
-
parent'
commit
|
commitdiff
|
tree
2014-11-06
Junio
C
Hamano
Merge branch 'jk/
f
etch-reflog-df-
c
onflict
'
commit
|
commitdiff
|
tree
2014-11-06
J
u
n
io C H
a
mano
Merge branc
h
'rs/use-child-process-init-mo
r
e'
commit
|
commitdiff
|
tree
2014-11-06
J
u
nio
C Hamano
Merge branch
'jk
/
cach
e
-tree
-
p
r
o
t
ect-from-broken-li
b
git2'
commit
|
commitdiff
|
tree
2014-10-31
Junio C
Hamano
Git 2
.
2
.
0-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-31
J
unio C Hamano
Merge branch
'for-j
u
nio
'
o
f gi
t
://bogom
i
ps
.
o
rg/git-svn
commit
|
commitdiff
|
tree
2014-10-31
Junio C Ha
m
ano
Merge branch 'jc/p
u
sh-cert'
commit
|
commitdiff
|
tree
2014-10-31
Ju
n
io
C Hamano
M
erge branc
h
'rs/
c
hild-process-init
'
commit
|
commitdiff
|
tree
2014-10-31
Ju
n
io C
H
amano
Merge branch
'
rs/g
r
ep-color-wo
r
ds'
commit
|
commitdiff
|
tree
2014-10-30
Junio C
H
ama
n
o
bund
l
e
:
s
p
lit o
u
t
a helper fun
c
tion to
c
ompute and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-30
Junio C Ham
a
no
bu
n
dle: split
o
u
t
a
h
elper func
t
ion to create pack
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-30
Juni
o
C
Hama
n
o
Merge git://ozlabs
.
o
rg/
~
paulus/gitk
commit
|
commitdiff
|
tree
2014-10-29
Junio
C
Ham
a
n
o
Syn
c
with Git 2
.
1
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-29
Ju
n
io C Hamano
Git 2
.
1
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-29
Junio C Hama
n
o
M
e
rge
branch
'
jk
/
pack-o
b
j
e
cts
-
no-bit
m
ap-when-splitting
.
.
.
commit
|
commitdiff
|
tree
2014-10-29
Junio C Hamano
Merge branc
h
'da/
m
erg
e
tool-meld'
i
nto maint
commit
|
commitdiff
|
tree
2014-10-29
Junio C
Hamano
Merge branch
'
rm/gitweb-start-form' into maint
commit
|
commitdiff
|
tree
2014-10-29
Junio C
Hamano
Mer
g
e branch 'bc/
a
scii
d
oc-pretty-formats-fix' into
.
.
.
commit
|
commitdiff
|
tree
2014-10-29
Junio C H
a
mano
Merge bran
c
h '
r
s/daemon-f
i
x
e
s'
i
nto main
t
commit
|
commitdiff
|
tree
2014-10-29
J
u
nio C Hamano
U
p
d
ate
dra
f
t release notes to 2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-29
Junio C Ha
m
a
n
o
Merg
e
branch 'da/difftoo
l
'
commit
|
commitdiff
|
tree
2014-10-29
Junio C
H
aman
o
Me
r
ge
b
ranch 'rb/pack-window-memory-config-doc'
commit
|
commitdiff
|
tree
2014-10-29
Junio C Hamano
Me
r
ge b
r
anch 'mg/li
b
-gpg-ro-safety'
commit
|
commitdiff
|
tree
2014-10-29
Junio C Hamano
M
e
r
g
e br
a
nch 'dm/port2zos'
commit
|
commitdiff
|
tree
2014-10-29
J
u
n
i
o C Haman
o
M
e
rge
b
ranch 'oc/mergetools-beyondcompare
'
commit
|
commitdiff
|
tree
2014-10-29
Juni
o
C Hamano
M
erge branch 'jk/prune-mtime'
commit
|
commitdiff
|
tree
2014-10-29
Junio C
Hamano
Merge branch 'bc/asciidoc
t
or'
commit
|
commitdiff
|
tree
next