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: deprecate 'git merge <message> HEAD <commit>' syntax
2015-04-29
Junio C Hamano
merge: d
e
prec
a
te 'git merge <message> HEAD <commit
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
amano
m
erg
e
: hand
l
e FETC
H
_HE
A
D i
n
ter
n
ally
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C
H
aman
o
merge: deci
d
e if we auto-gen
e
rate t
h
e mess
a
ge ear
l
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o C Hamano
merge: m
a
ke
c
ollec
t
_p
a
rents() auto-generate the merge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
amano
merge:
extract pr
e
pare_merge_message() logic o
u
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio
C
Hamano
mer
g
e:
n
arrow scope
o
f merge_
n
a
m
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C Hamano
m
e
r
ge
:
split red
u
ce_parents()
o
ut of collect_parent
s
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C H
a
m
a
no
m
e
r
g
e:
clarify
coll
e
ct_paren
t
s()
l
ogic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
a
m
ano
merge: s
m
all leakfix and code simp
l
ifi
c
at
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: do not check
a
r
g
c to determine number
o
f remote
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio C
Hamano
merge:
clarify "pulli
n
g in
t
o void" spe
c
ial case
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io C
Hamano
t5520: t
e
st pulling an o
c
topus into an unborn
b
ranch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
t5520: style fixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio C Ham
a
n
o
merge: simplify code flow
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge:
t
e
s
t the
t
op-
l
e
v
el merg
e
driver
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-01-12
J
u
ni
o
C H
a
mano
Git
2
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-01-12
Junio C Hamano
Merge bra
n
ch 'jk/r
e
ad-pa
c
k
e
d-
r
efs-wit
h
ou
t
-pa
t
h-
m
ax
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio
C
Ham
a
no
Merge bran
c
h
'mg/a
d
d-ignore-erro
r
s
'
i
n
t
o maint
commit
|
commitdiff
|
tree
2015-01-12
Junio C H
a
ma
n
o
Merge
branch
'
mh/f
i
nd-uniq-abbrev' into main
t
commit
|
commitdiff
|
tree
2015-01-12
Ju
n
io C Hama
n
o
Merge branch 'jk/appr
o
xidate-avoid-
y
-d-m-over-futur
e
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
J
u
nio
C
Hamano
Merge b
r
an
c
h 'rw/apply-d
o
es-
n
ot-take-igno
r
e-date' into
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Juni
o
C Hamano
Mer
g
e branch 'j
k
/for-each
-
reflog-ent-re
v
erse'
into
.
.
.
commit
|
commitdiff
|
tree
2015-01-07
Junio C H
a
man
o
Me
r
ge b
r
a
nch
'm
a
int-2
.
1' into maint
commit
|
commitdiff
|
tree
2015-01-07
Junio
C
Hamano
Mer
g
e bra
n
ch 'maint-2
.
0'
i
n
to maint-2
.
1
commit
|
commitdiff
|
tree
2015-01-07
Junio C Hamano
Mer
g
e branch 'mai
n
t-1
.
9' into
m
ain
t
-2
.
0
commit
|
commitdiff
|
tree
2015-01-07
J
u
nio C
H
am
a
no
Merge branch 'maint-1
.
8
.
5' into mai
n
t-1
.
9
commit
|
commitdiff
|
tree
2015-01-07
Jun
i
o C Hama
n
o
M
e
rge branc
h
'j
k
/dotgit-case-ma
i
nt-1
.
8
.
5' i
n
t
o maint
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Junio C
H
am
a
n
o
Prepare for 2
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-22
Junio
C
Haman
o
Merge branch
'jk/rebui
l
d-p
e
rl-scripts-with-no
-
p
e
r
l
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Junio C Haman
o
Mer
g
e
b
r
a
nch 'j
k
/no-perl-te
s
t
s' in
t
o
m
a
i
nt
commit
|
commitdiff
|
tree
2014-12-22
J
u
nio C Haman
o
M
e
rge
b
ranch 'po/everyday-doc' into maint
commit
|
commitdiff
|
tree
2014-12-22
J
unio C Hamano
M
e
rg
e
branch
'
jk/p
u
sh-simp
l
e' into main
t
commit
|
commitdiff
|
tree
2014-12-22
J
unio C
H
aman
o
Merge
b
r
an
c
h 'mh/config-flip-xbit-back-after-checki
n
g
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Ju
n
io
C
Hamano
Merge bran
c
h 'jk/gitwe
b
-with-
n
ew
e
r-cgi-m
u
l
ti-param
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
J
u
nio C Ha
m
ano
Mer
g
e bra
n
ch 'rs
/
receive-pack-use-labs
'
into maint
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Merge b
r
anch 'rs/maint-con
f
ig-
u
se-labs' into maint
commit
|
commitdiff
|
tree
2014-12-22
Juni
o
C H
a
m
ano
Merge branch
'js/windows-open-ei
s
dir-er
r
or' into maint
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Merge
branch
'
jk/colors-fix' i
n
to m
a
int
commit
|
commitdiff
|
tree
2014-12-22
Junio C Ham
a
no
Merge branch 'jk/checkou
t
-from-tree' into maint
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
Junio
C
Ham
a
no
Sync wi
t
h v2
.
1
.
4
commit
|
commitdiff
|
tree
2014-12-17
Junio C Ham
a
no
Git
2
.
1
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jun
i
o C
H
am
a
no
Sync with
v2
.
0
.
5
commit
|
commitdiff
|
tree
2014-12-17
Junio C Hamano
Git 2
.
0
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
J
u
nio C Haman
o
Sync with v1
.
9
.
5
commit
|
commitdiff
|
tree
2014-12-17
Ju
n
io C Hamano
Git
1
.
9
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Junio C H
a
m
a
no
Sync wi
t
h v1
.
8
.
5
.
6
commit
|
commitdiff
|
tree
2014-12-17
Junio C
Ha
m
a
n
o
G
i
t
1
.
8
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
J
u
nio
C
Hamano
Merge bran
c
h
'dotgit-ca
s
e
-maint-1
.
8
.
5' into main
t
-1
.
8
.
5
commit
|
commitdiff
|
tree
2014-12-05
J
unio C
Hamano
Merge
b
ranch 'main
t
' of g
i
t
://github
.
com/git-
l
10n
/
g
it
.
.
.
commit
|
commitdiff
|
tree
2014-12-05
J
u
nio C H
a
mano
Start post 2
.
2 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-26
Junio C Ha
m
ano
G
i
t 2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-21
J
u
nio C Hamano
Git 2
.
2
.
0-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-19
J
u
nio C
H
amano
M
erge
bra
n
ch 's
v
/
s
u
b
mi
t
ting-final-pa
t
c
h
'
commit
|
commitdiff
|
tree
2014-11-19
Junio
C
Ha
m
ano
Merge branch '
s
n/tut
o
ria
l
-status-output-example'
commit
|
commitdiff
|
tree
2014-11-19
Junio C Hamano
Merge bran
c
h 'mh/doc
-
re
m
ote-helpe
r
-
xref'
commit
|
commitdiff
|
tree
2014-11-19
Jun
i
o C Ham
a
no
Merge
b
r
anc
h
'tb/no-relative-file-url'
commit
|
commitdiff
|
tree
2014-11-19
Junio
C
Hamano
M
erge
b
ra
n
ch 'cc/
i
nterpre
t
-trailers'
commit
|
commitdiff
|
tree
2014-11-18
Junio C Hamano
Merge git://github
.
com/git
-
l10n/git-po
commit
|
commitdiff
|
tree
2014-11-18
J
unio C Hamano
M
erge branch 'jc/do
c
-
c
ommit-only'
commit
|
commitdiff
|
tree
2014-11-18
Junio C Ham
a
no
Merge branc
h
'ta/
t
utorial-mo
d
ernize'
commit
|
commitdiff
|
tree
2014-11-18
Junio C Hamano
Merge br
a
nch 'da/dif
f
tool'
commit
|
commitdiff
|
tree
2014-11-17
Ju
n
i
o C Hamano
Merge branch 'master'
o
f git://github
.
com/git-
l
10n
.
.
.
commit
|
commitdiff
|
tree
2014-11-14
J
unio C Hamano
Git
2
.
2
.
0-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-12
J
u
nio C
H
amano
Update dr
a
ft re
l
e
a
se notes to 2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-12
Junio C Hamano
Sync with 'maint'
commit
|
commitdiff
|
tree
2014-11-12
Junio C Ha
m
ano
Merg
e
branch 'nd/gitignore
-
trailing-
w
hites
p
a
c
e' into
.
.
.
commit
|
commitdiff
|
tree
2014-11-12
Junio
C
Hamano
M
e
rge branc
h
'jk/fetch-r
e
flog-df-con
f
lict'
commit
|
commitdiff
|
tree
2014-11-11
Ju
n
io C Hamano
Sync with maint
commit
|
commitdiff
|
tree
2014-11-11
J
u
nio C
H
amano
M
erge branch 'rs/clean
-
menu-item-defn'
into maint
commit
|
commitdiff
|
tree
2014-11-10
Junio C Hamano
Merge branch 'master' of git:
/
/
github
.
com/git-l10n
.
.
.
commit
|
commitdiff
|
tree
2014-11-10
Junio C Hamano
Sync with maint
commit
|
commitdiff
|
tree
2014-11-10
Juni
o
C Hamano
Merge bran
c
h
'
js/
d
iff-highl
i
g
h
t-avoid-s
i
gpipe'
commit
|
commitdiff
|
tree
2014-11-07
Junio
C Ham
a
n
o
Git 2
.
2
.
0-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-07
Junio C Hamano
D
o
cumentati
o
n/gi
t
-com
m
it: clarify that --o
n
ly/--
i
n
clude
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-06
J
u
nio
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2014-11-06
J
u
n
io C Hama
n
o
Merge branch
'n
d
/g
i
tignore-trailing
-
whitespace'
commit
|
commitdiff
|
tree
2014-11-06
Junio C
H
am
a
no
Merge br
a
nch 'tm/lin
e
-log-first-parent'
commit
|
commitdiff
|
tree
2014-11-06
Jun
i
o C Hamano
Merge branch 'jk
/
f
etch-reflog-df-conflic
t
'
commit
|
commitdiff
|
tree
2014-11-06
Junio C Ham
a
no
M
e
rg
e
branch '
r
s
/
use
-
c
h
il
d
-proc
e
ss-init-more'
commit
|
commitdiff
|
tree
2014-11-06
Junio
C
Hamano
Merge branch
'jk/cache-tree-protect-
f
rom
-
b
r
oken-libgit2'
commit
|
commitdiff
|
tree
2014-10-31
Junio C Hamano
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
M
e
rge
b
ra
n
ch
'
for
-
j
unio'
o
f git:/
/
bog
o
mi
p
s
.
org/git-svn
commit
|
commitdiff
|
tree
2014-10-31
Junio C Hamano
Merge branch
'
j
c
/push-cert'
commit
|
commitdiff
|
tree
2014-10-31
Junio C Ha
m
ano
Me
r
ge branch 'rs/child-process-init'
commit
|
commitdiff
|
tree
2014-10-31
J
u
nio C Hamano
M
e
rge branc
h
'r
s
/grep-color-
w
o
rds'
commit
|
commitdiff
|
tree
2014-10-30
Junio C Hamano
bundl
e
: s
p
lit ou
t
a helper function to co
m
pute a
n
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-30
Junio C Hamano
bun
d
le: split
o
ut a helpe
r
function to create pack
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-30
J
unio C Hamano
Me
r
ge git://
o
zlabs
.
or
g
/~paulus/gitk
commit
|
commitdiff
|
tree
2014-10-29
J
unio C
H
amano
Sync wi
t
h Git 2
.
1
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-29
Junio C Hamano
Git 2
.
1
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-29
Jun
i
o C Ham
a
no
Me
r
g
e bra
n
ch '
j
k/pack-
o
b
j
ects-no-bitmap-
w
hen-sp
l
itti
n
g
.
.
.
commit
|
commitdiff
|
tree
2014-10-29
Jun
i
o
C
Ha
m
a
n
o
Merg
e
b
ranch 'da/mergetool-meld
'
in
t
o maint
commit
|
commitdiff
|
tree
2014-10-29
Ju
n
io C Ha
m
a
no
M
e
rge branch 'rm/gi
t
w
eb-sta
r
t-form' into maint
commit
|
commitdiff
|
tree
2014-10-29
Junio C
H
a
mano
M
erg
e
branch
'bc/asciidoc-pretty
-
for
m
ats-
f
ix' into
.
.
.
commit
|
commitdiff
|
tree
2014-10-29
Junio
C
Hamano
Merge
b
ranch 'rs/d
a
emon-
f
ixe
s
' int
o
maint
commit
|
commitdiff
|
tree
2014-10-29
Jun
i
o C Hamano
Upda
t
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
Junio C H
a
mano
Merg
e
branch 'da/d
i
f
f
tool'
commit
|
commitdiff
|
tree
2014-10-29
Junio C
Hamano
Merg
e
br
a
nch 'rb/pack-w
i
ndow-
m
emory-config-doc'
commit
|
commitdiff
|
tree
2014-10-29
Junio
C H
a
m
a
n
o
Merg
e
br
a
nch
'mg/lib-gpg-
r
o
-safety'
commit
|
commitdiff
|
tree
next