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: handle FETCH_HEAD internally
2015-04-29
Junio C
H
amano
merge: handl
e
FET
C
H_HEAD interna
l
ly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio
C
H
amano
me
r
g
e: decide
i
f we
a
uto
-
generate
the mess
a
ge ear
l
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hama
n
o
m
erge:
m
ake c
o
llect_paren
t
s(
)
auto
-
g
enerate the merg
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Haman
o
m
e
rge: ex
t
ract prepare_merge
_
m
e
s
sa
g
e
(
) logic ou
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: n
a
r
row scope of
m
er
g
e_
n
ames
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C H
a
m
an
o
merge: sp
l
i
t reduce_parents() out
o
f
c
ol
l
ect_p
a
rents()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
a
mano
merge: c
l
arify colle
c
t
_
parents() logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C H
a
mano
merge
:
sm
a
ll lea
k
fi
x
an
d
code
s
imp
l
ification
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
a
mano
mer
g
e: do not check argc
t
o determine number of
r
emote
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: clarify "p
u
ll
i
ng
int
o
voi
d
" special case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
t5
5
20: test pulling
an oc
t
op
u
s into an un
b
orn bran
c
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
a
m
an
o
t5520: s
t
yle fixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C H
a
mano
merge
:
simplify co
d
e flow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ha
m
ano
merge: test
the top-lev
e
l merge
d
river
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-01-12
Junio C Hamano
Git 2
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-01-12
Junio C Hamano
Merge
b
ranch 'jk/read
-
packed-re
f
s-wi
t
h
o
u
t
-path-max
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio C Hamano
Merge branch '
m
g
/
add-ignor
e
-
e
rror
s
'
into maint
commit
|
commitdiff
|
tree
2015-01-12
Junio C
Hamano
Merge branch 'mh/find-
u
niq-abbrev' into maint
commit
|
commitdiff
|
tree
2015-01-12
Junio C
Hamano
Me
r
g
e branc
h
'jk/appro
x
i
date-avoid-y-d-
m
-over-futu
r
e
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Juni
o
C Ham
a
no
Merge b
r
anch 'rw/apply-does-not-take-ignore-date'
into
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio C Ha
m
an
o
Mer
g
e b
r
anch
'
jk/for-each
-
r
e
fl
o
g-en
t
-
reverse' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-01-07
Junio C H
a
ma
n
o
M
e
rge b
r
anch 'maint
-
2
.
1
'
into maint
commit
|
commitdiff
|
tree
2015-01-07
Junio C H
a
m
a
no
M
e
r
g
e
b
ranch
'
maint-2
.
0' into maint-2
.
1
commit
|
commitdiff
|
tree
2015-01-07
Junio C
Ham
a
no
Merge branch
'maint-1
.
9' int
o
maint-2
.
0
commit
|
commitdiff
|
tree
2015-01-07
Junio C H
a
mano
Merge branch 'ma
i
nt-
1
.
8
.
5' into maint
-
1
.
9
commit
|
commitdiff
|
tree
2015-01-07
J
un
i
o C Hamano
Me
r
ge branc
h
'jk/dotgit-case-maint-1
.
8
.
5
'
into
m
a
int
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
J
u
nio C Haman
o
Prepare f
o
r 2
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Merge
br
a
nch 'jk/reb
u
ild-perl-scripts-with
-
n
o
-p
e
rl
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Junio C H
a
m
a
no
Merge bra
n
ch 'jk/no-perl
-
test
s
'
i
nto maint
commit
|
commitdiff
|
tree
2014-12-22
Juni
o
C Hamano
Me
r
ge
b
ranch 'po/everyday-doc' int
o
maint
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hama
n
o
Merge
b
r
anch 'jk/push-simple' into mai
n
t
commit
|
commitdiff
|
tree
2014-12-22
J
unio C H
a
mano
Merge
branch 'mh/c
o
nf
i
g-f
l
ip-xbit-back
-
after-
c
hec
k
ing
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
J
unio
C Hamano
Merge branch 'jk/gitw
e
b
-with-
n
e
w
e
r-cgi-multi
-
param
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Ju
n
io C
H
a
m
ano
Merge br
a
nch 'rs/re
c
eiv
e
-pack-u
s
e
-
labs' into m
a
int
commit
|
commitdiff
|
tree
2014-12-22
J
unio C Hamano
Merge branch
'
rs/main
t
-
c
o
nfig-use-lab
s
' into maint
commit
|
commitdiff
|
tree
2014-12-22
Juni
o
C Haman
o
M
erge bran
c
h
'
j
s
/
w
i
ndows-open-eisdir-error' into maint
commit
|
commitdiff
|
tree
2014-12-22
Junio
C
Hamano
Merge branch 'jk/col
o
rs-f
i
x' into
maint
commit
|
commitdiff
|
tree
2014-12-22
Ju
n
io
C
H
a
mano
Mer
g
e bra
n
ch 'jk/c
h
ec
k
out-fro
m
-tree' into maint
commit
|
commitdiff
|
tree
2014-12-17
Junio C
H
amano
G
i
t
2
.
2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
J
u
nio C Hamano
Sync w
i
th v
2
.
1
.
4
commit
|
commitdiff
|
tree
2014-12-17
J
u
n
io C Hama
n
o
G
it 2
.
1
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Junio C Hamano
Sync with v2
.
0
.
5
commit
|
commitdiff
|
tree
2014-12-17
Junio
C
H
amano
G
it 2
.
0
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Junio C Hamano
Sync with 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
n
io C Ha
m
an
o
Sync wi
t
h 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
Jun
i
o C Hamano
Merge branch
'
dot
g
it-case-maint
-
1
.
8
.
5'
int
o
maint-1
.
8
.
5
commit
|
commitdiff
|
tree
2014-12-05
Junio C Hamano
Merge bran
c
h 'maint' of
git://gith
u
b
.
com/git-l10n/git
.
.
.
commit
|
commitdiff
|
tree
2014-12-05
Junio C Hamano
Sta
r
t
post 2
.
2 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-26
J
u
nio
C
H
amano
Git
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-21
Junio C H
a
mano
G
it 2
.
2
.
0
-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-19
Junio C Hamano
Merge bran
c
h
'sv
/
s
u
bmitting-final-patch'
commit
|
commitdiff
|
tree
2014-11-19
Junio C Hama
n
o
M
erge
b
ran
c
h 'sn/tutoria
l
-
s
ta
t
u
s
-output-exampl
e
'
commit
|
commitdiff
|
tree
2014-11-19
Junio C Hama
n
o
Merge branch
'
m
h/d
o
c-rem
o
te-helpe
r
-xref'
commit
|
commitdiff
|
tree
2014-11-19
Junio C Hamano
Mer
g
e
b
ranch 'tb/n
o
-re
l
ativ
e
-file-u
r
l'
commit
|
commitdiff
|
tree
2014-11-19
Junio C Ham
a
no
Merge br
a
nch 'cc/interpret-trailers'
commit
|
commitdiff
|
tree
2014-11-18
Junio C H
a
mano
M
erge git://github
.
com/git-l10n/git-po
commit
|
commitdiff
|
tree
2014-11-18
J
u
nio
C
Hamano
Merge branch 'jc/doc-commit-onl
y
'
commit
|
commitdiff
|
tree
2014-11-18
Junio C Hamano
Merg
e
b
ranch 'ta/tut
o
rial-moderniz
e
'
commit
|
commitdiff
|
tree
2014-11-18
Ju
n
io C H
a
mano
Merge
b
ranch
'
d
a
/
difftool'
commit
|
commitdiff
|
tree
2014-11-17
Junio
C Ha
m
ano
M
erge branch 'master'
of git://github
.
com/git-l10
n
.
.
.
commit
|
commitdiff
|
tree
2014-11-14
Junio C
H
amano
Git 2
.
2
.
0-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-12
Junio C H
a
mano
Update
d
ra
f
t r
e
lease
n
o
t
es to 2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-12
Junio C Haman
o
Sy
n
c with 'maint'
commit
|
commitdiff
|
tree
2014-11-12
Junio C
Hamano
Me
r
g
e
branch
'nd/git
i
gnore-tra
i
ling-w
h
itespace' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2014-11-12
Junio C Ha
m
ano
M
erg
e
branch 'jk/fetch-ref
l
og-
d
f-conf
l
ict'
commit
|
commitdiff
|
tree
2014-11-11
Ju
n
io C Hamano
S
ync
w
i
t
h mai
n
t
commit
|
commitdiff
|
tree
2014-11-11
Ju
n
io C Hamano
Merge branc
h
'rs/cle
a
n-menu
-
item-defn' into
maint
commit
|
commitdiff
|
tree
2014-11-10
Junio C Hamano
Merge branch 'mast
e
r' of git://github
.
com/git-l10n
.
.
.
commit
|
commitdiff
|
tree
2014-11-10
Junio
C
Ha
m
ano
Sync with maint
commit
|
commitdiff
|
tree
2014-11-10
Junio
C
Hamano
Merge branch 'js/
d
iff-highli
g
ht-avoid-sigp
i
p
e
'
commit
|
commitdiff
|
tree
2014-11-07
Juni
o
C
Hamano
Git 2
.
2
.
0-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-07
J
u
n
io C H
a
mano
D
o
c
umentation/g
i
t-
c
ommit: cla
r
ify that
-
-only/--inc
l
ude
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-06
Juni
o
C Hamano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2014-11-06
Junio C Hamano
Merge branch 'nd/gitignore-t
r
aili
n
g-w
h
itespace'
commit
|
commitdiff
|
tree
2014-11-06
Junio C H
a
mano
Me
r
ge branch 'tm/line-log-first-parent'
commit
|
commitdiff
|
tree
2014-11-06
Junio C Ha
m
ano
Merge branch
'
jk/fetch-reflog-df-conflict
'
commit
|
commitdiff
|
tree
2014-11-06
J
u
n
io C Hama
n
o
Merge branch
'rs/use-child-pro
c
ess-init-
m
ore
'
commit
|
commitdiff
|
tree
2014-11-06
Juni
o
C Hamano
Merge branch 'jk/
c
a
c
h
e-tre
e
-protect-from-br
o
ken-libgit2'
commit
|
commitdiff
|
tree
2014-10-31
J
u
nio C Hamano
Git 2
.
2
.
0-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-31
Junio C Hamano
Merg
e
branch 'for-
j
unio' of git://
b
ogom
i
ps
.
org/g
i
t
-
svn
commit
|
commitdiff
|
tree
2014-10-31
Junio C Hamano
Mer
g
e bran
c
h 'jc/push-cert'
commit
|
commitdiff
|
tree
2014-10-31
Junio C Hamano
Merge
b
ranch 'rs/child-process-i
n
it
'
commit
|
commitdiff
|
tree
2014-10-31
Junio
C Hamano
Merge bran
c
h 'rs/gre
p
-color-
w
o
rds'
commit
|
commitdiff
|
tree
2014-10-30
Juni
o
C
H
a
mano
b
u
nd
l
e: split out a
helper funct
i
on
t
o compute and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-30
Juni
o
C Haman
o
b
undle: split out a helpe
r
function to create pack
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-30
J
u
nio C Hamano
M
e
r
g
e g
i
t://ozlabs
.
org
/
~
pau
l
us/gitk
commit
|
commitdiff
|
tree
2014-10-29
J
u
n
i
o C
Haman
o
Sync with 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
Juni
o
C Hamano
Merge br
a
n
ch 'jk/pa
c
k-objects-no
-
bitmap-when-splitting
.
.
.
commit
|
commitdiff
|
tree
2014-10-29
Junio C H
a
mano
Merge br
a
nch 'da/merg
e
tool-
m
eld'
i
nto
ma
i
n
t
commit
|
commitdiff
|
tree
2014-10-29
J
unio C H
a
ma
n
o
M
e
rge bra
n
ch
'rm/g
i
tweb-start-form' into
maint
commit
|
commitdiff
|
tree
2014-10-29
Junio
C
Hama
n
o
Me
r
g
e branch 'bc/asciidoc-p
r
etty-formats-fix' into
.
.
.
commit
|
commitdiff
|
tree
2014-10-29
Junio C
Ha
m
ano
Merge b
r
anch 'rs/d
a
emon-fixes' in
t
o
m
aint
commit
|
commitdiff
|
tree
2014-10-29
Junio C
H
amano
Update draft
relea
s
e notes
to 2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-29
Junio C Hamano
Merge
br
a
nch 'da/difftool'
commit
|
commitdiff
|
tree
2014-10-29
J
u
nio C Ha
m
ano
M
e
rge branch 'rb/pack-window-
m
emory-conf
i
g-doc'
commit
|
commitdiff
|
tree
2014-10-29
Junio C H
a
m
ano
Merge bra
n
ch 'mg/l
i
b
-
gpg-ro
-
safety'
commit
|
commitdiff
|
tree
2014-10-29
Ju
n
i
o
C Hamano
Merge
b
ranch 'dm/port
2
zos'
commit
|
commitdiff
|
tree
next