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: handle FETCH_HEAD internally
2015-04-29
Junio C Hamano
merge: handle FETCH_HEAD internally
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C H
a
mano
merge:
d
ecide if we auto
-
g
enerate
the mess
a
ge
early
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o C Ham
a
no
mer
g
e: ma
k
e col
l
ect_p
a
ren
t
s() auto-
g
enerate
t
he mer
g
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
m
e
r
g
e: ext
r
act prepare
_
merge_message(
)
logic out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
m
e
r
g
e
:
n
a
r
r
ow scope o
f
merge_names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C Hama
n
o
merge
:
split reduce_parents() out of collect_parents()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: clarify collect_pa
r
ent
s
() lo
g
ic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merg
e
: small
leakfix a
n
d code simplification
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o C Haman
o
m
er
g
e: do n
o
t check argc to
d
e
t
ermine nu
m
ber of remote
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C H
a
mano
merge: clari
f
y
"pulling in
t
o void" special
c
a
s
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C H
a
ma
n
o
t55
2
0:
t
e
st
p
u
lling an octop
u
s into an unborn branch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io C Ha
m
a
no
t5520
:
style
f
ixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: s
i
mplify code flow
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
a
man
o
merge: test the
to
p
-level merge dr
i
v
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-01-12
Junio C Hamano
G
i
t 2
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-01-12
J
u
nio C
Hamano
Merge branch
'
jk
/
read-packe
d
-ref
s
-without-p
a
th-max
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Juni
o
C H
a
mano
Merge b
r
anch 'mg/a
d
d-ignore-errors' into maint
commit
|
commitdiff
|
tree
2015-01-12
Junio C
H
amano
Me
r
ge
b
ranch 'mh/fin
d
-uniq-abbrev' into maint
commit
|
commitdiff
|
tree
2015-01-12
Junio C Hamano
Merge b
r
a
n
ch 'jk/a
p
proxidate-a
v
oid-y
-
d
-m-over-f
u
ture
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio
C
Hamano
Merge
b
ranch
'rw/app
l
y-does-
n
ot-
t
ake-ignore-date' into
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio C
Hamano
Mer
g
e branch 'jk/
f
or-each-reflog
-
ent-reverse
'
into
.
.
.
commit
|
commitdiff
|
tree
2015-01-07
J
unio C
Hamano
Merge br
a
n
ch 'ma
i
nt-2
.
1' into maint
commit
|
commitdiff
|
tree
2015-01-07
Junio C Ha
m
ano
Merge branch 'ma
i
nt-2
.
0' in
t
o ma
i
nt-2
.
1
commit
|
commitdiff
|
tree
2015-01-07
J
u
nio C Hamano
M
e
r
g
e
branch 'maint-1
.
9' i
n
to m
a
int
-
2
.
0
commit
|
commitdiff
|
tree
2015-01-07
Juni
o
C Hamano
Merge
b
ranch
'
mai
n
t-
1
.
8
.
5' int
o
ma
i
n
t
-1
.
9
commit
|
commitdiff
|
tree
2015-01-07
J
u
nio C Ha
m
ano
Merge branch 'jk/dotgi
t
-ca
s
e-maint-1
.
8
.
5' int
o
maint
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hama
n
o
Pr
e
pare for 2
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-22
Juni
o
C Ham
a
no
Merge branch 'jk/rebuild-pe
r
l-s
c
ripts-wi
t
h-no-perl
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Merge branch 'jk/no-perl-tests' into maint
commit
|
commitdiff
|
tree
2014-12-22
Junio C H
a
mano
Merge
b
r
anch 'po/every
d
ay-do
c
' into
m
aint
commit
|
commitdiff
|
tree
2014-12-22
J
u
n
io C Hamano
M
e
rge b
r
anch 'jk/push-
s
i
m
ple' into maint
commit
|
commitdiff
|
tree
2014-12-22
J
u
nio
C Ham
a
no
Merge branch '
m
h/con
f
ig
-
flip-xb
i
t
-
back-after
-
ch
e
cking
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
J
u
nio C Hamano
Merge branch 'jk/gitweb
-
w
ith
-
newer-cgi-multi-
p
aram
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Junio C H
a
man
o
Merge
branch 'rs/receive
-
pa
c
k-
u
se-
l
abs'
int
o
mai
n
t
commit
|
commitdiff
|
tree
2014-12-22
J
unio C Hamano
Me
r
ge branch '
r
s/ma
i
nt-config-u
s
e-labs' in
t
o
maint
commit
|
commitdiff
|
tree
2014-12-22
Junio C H
a
mano
Me
r
ge branch 'js/w
i
nd
o
w
s
-open-ei
s
dir-
e
rror' into maint
commit
|
commitdiff
|
tree
2014-12-22
J
unio C Hamano
Merg
e
branch 'jk/
c
olors-
f
ix' int
o
maint
commit
|
commitdiff
|
tree
2014-12-22
J
unio C Hamano
M
e
rge branch
'jk/checkout-from-tree' int
o
m
a
i
nt
commit
|
commitdiff
|
tree
2014-12-17
Junio C
Ham
a
no
Git 2
.
2
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Junio
C H
a
m
ano
Sync with v2
.
1
.
4
commit
|
commitdiff
|
tree
2014-12-17
Junio C Ham
a
n
o
Git 2
.
1
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
J
u
ni
o
C Hamano
Sync
w
it
h
v2
.
0
.
5
commit
|
commitdiff
|
tree
2014-12-17
Ju
n
io 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
w
it
h
v1
.
9
.
5
commit
|
commitdiff
|
tree
2014-12-17
Junio C Hamano
Git 1
.
9
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
J
u
nio
C Ham
a
no
Sync with
v
1
.
8
.
5
.
6
commit
|
commitdiff
|
tree
2014-12-17
J
unio
C
Ha
m
ano
Gi
t
1
.
8
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Junio C Hamano
Merge branch 'dot
g
it-case-maint-1
.
8
.
5'
into
m
aint-1
.
8
.
5
commit
|
commitdiff
|
tree
2014-12-05
J
unio
C Hamano
Merge branch '
m
aint' of gi
t
:
/
/
github
.
com/
g
i
t
-
l10n/git
.
.
.
commit
|
commitdiff
|
tree
2014-12-05
J
unio C Hamano
S
t
a
r
t post 2
.
2 cyc
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-26
Jun
i
o
C Hama
n
o
G
i
t 2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-21
Ju
n
io C H
a
m
a
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 H
a
man
o
Mer
g
e branch '
s
v/submi
t
ting-fina
l
-
p
a
tch'
commit
|
commitdiff
|
tree
2014-11-19
Junio
C Ha
m
ano
M
erge bra
n
ch 'sn/tuto
r
ial-st
a
t
us-
o
utput-e
x
ampl
e
'
commit
|
commitdiff
|
tree
2014-11-19
Junio C Hamano
Merge branch
'
mh/doc-remote
-
hel
p
er-xref'
commit
|
commitdiff
|
tree
2014-11-19
Jun
i
o
C Ha
m
ano
Merge branc
h
't
b
/no-
r
el
a
t
ive
-
file-url'
commit
|
commitdiff
|
tree
2014-11-19
J
unio
C
Ha
m
ano
Merge
b
ranch 'cc/int
e
rpret-trailer
s
'
commit
|
commitdiff
|
tree
2014-11-18
Junio C Hamano
Merge git://github
.
com/gi
t
-l10n
/
git-p
o
commit
|
commitdiff
|
tree
2014-11-18
J
u
nio C Haman
o
Merge b
r
a
n
c
h '
j
c/doc-c
o
mmit-only'
commit
|
commitdiff
|
tree
2014-11-18
J
u
nio C
H
amano
Merge b
r
anch 'ta/tuto
r
ial-modern
i
ze'
commit
|
commitdiff
|
tree
2014-11-18
Juni
o
C Hamano
Merge bran
c
h 'da
/
difftool'
commit
|
commitdiff
|
tree
2014-11-17
Juni
o
C Hamano
M
e
r
g
e b
r
an
c
h
'ma
s
ter'
o
f git://
g
ithub
.
com/git-
l
10n
.
.
.
commit
|
commitdiff
|
tree
2014-11-14
J
u
nio C Hamano
Git
2
.
2
.
0
-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-12
Ju
n
io C Hamano
Update draft relea
s
e
n
ote
s
to 2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-12
Junio C
H
a
mano
Sync with
'maint'
commit
|
commitdiff
|
tree
2014-11-12
Junio
C
Hamano
Merge
b
ran
c
h
'nd/
g
i
t
i
g
n
ore-tra
i
li
n
g-whitespa
c
e' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2014-11-12
Junio C H
a
mano
Mer
g
e b
r
anch 'jk/fet
c
h-reflog-df-conf
l
ict'
commit
|
commitdiff
|
tree
2014-11-11
Junio C H
a
mano
Sync wit
h
ma
i
nt
commit
|
commitdiff
|
tree
2014-11-11
Junio C Hamano
Merge bran
c
h
'rs
/
c
l
ean-menu-item-defn'
into maint
commit
|
commitdiff
|
tree
2014-11-10
J
u
nio C Hamano
Merge branch '
m
a
s
ter
'
of gi
t
://github
.
com/git-l10n
.
.
.
commit
|
commitdiff
|
tree
2014-11-10
J
u
nio C Ha
m
a
n
o
Syn
c
wit
h
maint
commit
|
commitdiff
|
tree
2014-11-10
J
uni
o
C
Hamano
Me
r
g
e
b
ranch 'js/
d
iff-highlight-avoid
-
s
igp
i
pe'
commit
|
commitdiff
|
tree
2014-11-07
J
u
nio C
Ha
m
ano
Git 2
.
2
.
0-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-07
Junio C Ham
a
no
Documentation/g
i
t
-commit: clarify that --
o
nly/--include
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-06
J
unio
C
Hamano
M
e
rg
e
bran
c
h 'm
a
in
t
'
commit
|
commitdiff
|
tree
2014-11-06
J
u
nio C Hamano
M
e
r
g
e
b
ranch 'nd/g
i
tignore-
t
railing-whit
e
space'
commit
|
commitdiff
|
tree
2014-11-06
Juni
o
C
Ha
m
ano
Merge
b
ra
n
ch 'tm/line-lo
g
-fi
r
st-parent'
commit
|
commitdiff
|
tree
2014-11-06
Junio C Hamano
Merge branch '
j
k/fetch-ref
l
o
g
-
d
f-confl
i
ct'
commit
|
commitdiff
|
tree
2014-11-06
Junio C Hama
n
o
Merge
b
ranch 'rs/use
-
child-p
r
oces
s
-in
i
t-more'
commit
|
commitdiff
|
tree
2014-11-06
J
uni
o
C Hamano
M
e
rge bra
n
c
h 'jk/
c
ac
h
e-tree-protect
-
from-broken-libg
i
t2
'
commit
|
commitdiff
|
tree
2014-10-31
Junio C Haman
o
G
i
t 2
.
2
.
0-rc0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-31
Junio C Hamano
Merge branch 'f
o
r-junio' of
git://bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2014-10-31
Junio C Hamano
Merg
e
branch 'jc/push-cert'
commit
|
commitdiff
|
tree
2014-10-31
Junio C Ha
m
ano
Merge branch 'rs/child-proces
s
-in
i
t'
commit
|
commitdiff
|
tree
2014-10-31
Ju
n
io C Ham
a
no
M
erge
b
r
a
nch 'rs/grep-color-word
s
'
commit
|
commitdiff
|
tree
2014-10-30
Junio C Ham
a
n
o
bundle:
split o
u
t a help
e
r function to
compute and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-30
Jun
i
o C
Hamano
bundle:
s
p
l
i
t
out
a
help
e
r fun
c
tio
n
to create pack
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-30
Junio C Hamano
M
e
r
g
e git:
/
/ozlab
s
.
org/~paulus
/
gitk
commit
|
commitdiff
|
tree
2014-10-29
Junio C Ha
m
ano
Sync with Git
2
.
1
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-29
J
u
nio
C
Ha
m
ano
Git 2
.
1
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-29
Junio C Hamano
M
erge b
r
anch 'jk/pack-objects-no-bitmap-when-split
t
ing
.
.
.
commit
|
commitdiff
|
tree
2014-10-29
Ju
n
io C Hamano
Merge bran
c
h
'da/merge
t
ool-meld' into m
a
i
nt
commit
|
commitdiff
|
tree
2014-10-29
Junio C Hamano
Merge branch 'rm/gitweb-start
-
form' int
o
maint
commit
|
commitdiff
|
tree
2014-10-29
Junio C Haman
o
Merge bran
c
h 'bc/asciid
o
c-pretty-f
o
rmats-
f
ix' into
.
.
.
commit
|
commitdiff
|
tree
2014-10-29
Junio C Hamano
Merge
branch 'rs/daemon-fix
e
s' into main
t
commit
|
commitdiff
|
tree
2014-10-29
J
u
n
i
o C Hamano
Updat
e
draft relea
s
e notes
t
o 2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-29
J
un
i
o
C Hamano
Merge branch 'da
/
difftool'
commit
|
commitdiff
|
tree
2014-10-29
Junio
C Ham
a
no
Merge br
a
nch 'rb
/
pack-window-me
m
ory-config-doc'
commit
|
commitdiff
|
tree
2014-10-29
Jun
i
o C
H
a
mano
Merge b
r
a
n
ch 'mg/li
b
-gpg-ro-safety'
commit
|
commitdiff
|
tree
2014-10-29
Junio C Hamano
Merge b
r
anch
'dm/port2
z
o
s
'
commit
|
commitdiff
|
tree
next