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
t5520: test --rebase failure on unborn branch with index
2015-05-29
P
a
ul Ta
n
t5520: tes
t
--re
b
as
e
f
ailure o
n
unborn branch wi
t
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Pau
l
Tan
t5520: test --reba
s
e with mul
t
i
p
le
b
r
anches
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520: test w
o
rk tree fast-forward when fetch updates
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul
T
an
t5520: test for failure if index
h
as unresolved entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
t
5
520
:
test no m
e
r
ge candidat
e
s cases
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul T
a
n
t5520: preven
t
field spl
i
tt
i
ng in
c
o
n
te
n
t
compariso
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o
C Hama
n
o
merge
:
d
e
p
recate 'git merge
<
messag
e
> HEAD <commit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
Hamano
m
e
rge: han
d
le FE
T
CH_HEAD internall
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge:
decide
if we
a
ut
o
-genera
t
e the
m
essage early
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hama
n
o
m
erge: m
a
ke c
o
llect_parent
s
() auto-gen
e
rat
e
the merge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
H
amano
merge: extract prepa
r
e_
m
erg
e
_
m
essage()
logic out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C
Hamano
m
e
rg
e
: narrow sc
o
p
e
of merge_names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: split reduce
_
parents() out of
collect_pa
r
e
nts(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: clarify collec
t
_pa
r
ents(
)
logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o C Haman
o
merge: small le
a
kfix and
c
o
d
e
simp
l
ificatio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: do not check argc to
d
etermine
number
of remote
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
unio C Hama
n
o
m
erge: clari
f
y "pullin
g
into void" spe
c
ial case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
t5520: test pulling an octopu
s
into an unborn branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Haman
o
t5520:
sty
l
e
f
ixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: si
m
plify code flow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
i
o
C
H
amano
merge: test the top-lev
e
l me
r
ge drive
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-01-12
Juni
o
C Hamano
Git 2
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-01-12
Junio
C Ha
m
ano
Merge br
a
nch
'
j
k
/r
e
ad-packed-r
e
fs-without-pa
t
h-
m
ax
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Ju
n
i
o
C Ha
m
a
no
Merge
b
ranch
'
mg/add-
i
g
no
r
e
-
errors' i
n
to maint
commit
|
commitdiff
|
tree
2015-01-12
Junio C Haman
o
M
e
rge bra
n
ch 'mh
/
fin
d
-uniq-a
b
b
r
ev' in
t
o maint
commit
|
commitdiff
|
tree
2015-01-12
Junio
C Hamano
Merge branch 'j
k
/appro
x
idate-avoid-y-d-m-o
v
er-future
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Ju
n
io C
H
a
mano
Me
r
ge
b
r
a
nch
'rw/a
p
ply-does-not
-
take-i
g
n
ore-date'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio C Hamano
Merge b
r
anch
'
j
k/for
-
e
a
ch-reflog-ent-rever
s
e' into
.
.
.
commit
|
commitdiff
|
tree
2015-01-07
J
u
ni
o
C Hamano
Merge
b
r
a
nch '
m
aint-2
.
1' into maint
commit
|
commitdiff
|
tree
2015-01-07
Junio C Ha
m
ano
M
e
rge branch 'maint-2
.
0
'
i
nt
o
maint-2
.
1
commit
|
commitdiff
|
tree
2015-01-07
J
unio C
H
amano
Merge
b
ranch 'maint-1
.
9
'
into
maint-2
.
0
commit
|
commitdiff
|
tree
2015-01-07
J
unio C Haman
o
Merge branch 'maint-1
.
8
.
5' into ma
i
nt-1
.
9
commit
|
commitdiff
|
tree
2015-01-07
Junio C Ham
a
no
Merge
branch '
j
k
/
dotgi
t
-case-ma
i
nt
-
1
.
8
.
5'
into
m
aint
.
.
.
commit
|
commitdiff
|
tree
2014-12-29
Jeff King
is_hfs_
d
o
tgit: loosen over-eager match of \u
{
.
.
47}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-22
Ju
n
io C Haman
o
Prepare for 2
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-22
Junio
C
Hamano
M
erge branch 'jk/rebuild-pe
r
l
-
scri
p
t
s
-
with-n
o
-perl
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
J
u
nio C
Hamano
Merge branch 'jk/no-per
l
-tes
t
s
'
into maint
commit
|
commitdiff
|
tree
2014-12-22
J
unio C Hamano
Merge bra
n
ch 'po/everyday-doc' into maint
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Merge b
r
anch 'jk/push-simple' into main
t
commit
|
commitdiff
|
tree
2014-12-22
J
u
ni
o
C Ham
a
no
Merge branch 'm
h
/c
o
n
fig-flip-
x
bit-back-a
f
ter-check
i
ng
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Junio C
H
a
m
a
no
Merge branch '
j
k/gi
t
web-with-
n
ewer-cgi-multi-param
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
M
e
rge branch 'rs/receive-
p
ac
k
-use
-
l
a
b
s
' into
maint
commit
|
commitdiff
|
tree
2014-12-22
Jun
i
o C Haman
o
Merge
b
ranch 'rs/maint-config-use-labs' into m
a
int
commit
|
commitdiff
|
tree
2014-12-22
Junio
C Hama
n
o
Merge branch 'js/window
s
-open-ei
s
dir-error'
in
t
o maint
commit
|
commitdiff
|
tree
2014-12-22
Junio C Ha
m
ano
Mer
g
e
bran
c
h '
j
k/colors-fix' into maint
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Merge branch 'j
k
/ch
e
cko
u
t-fro
m
-tree
'
i
nto
ma
i
nt
commit
|
commitdiff
|
tree
2014-12-22
A
lexander Kulesh
o
v
cl
e
an: t
y
pof
i
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
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
J
u
nio C Hamano
S
y
nc with v2
.
1
.
4
commit
|
commitdiff
|
tree
2014-12-17
J
unio C Hamano
Git 2
.
1
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Junio C Hamano
S
y
nc with
v
2
.
0
.
5
commit
|
commitdiff
|
tree
2014-12-17
Junio C H
a
m
ano
Gi
t
2
.
0
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
J
u
nio
C
Ha
m
a
no
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
Junio
C
Haman
o
Sync with v1
.
8
.
5
.
6
commit
|
commitdiff
|
tree
2014-12-17
Junio C Hamano
Git 1
.
8
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Junio C Hamano
Mer
g
e branch 'dotgit-ca
s
e-m
a
in
t
-1
.
8
.
5
'
into ma
i
nt-1
.
8
.
5
commit
|
commitdiff
|
tree
2014-12-17
Johan
n
es Schindel
i
n
f
s
ck: co
m
plain about
NTFS "
.
g
it" alia
s
es
i
n trees
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Johannes Sc
h
indelin
re
a
d-ca
c
he:
o
ptiona
l
ly
d
i
sallow
N
TFS
.
git
va
r
ian
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Joh
a
nnes S
c
h
i
ndelin
path
:
a
d
d
is_ntfs_dotgit() helper
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
f
s
ck: comp
l
ain about HFS+ "
.
git" aliases in trees
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
J
e
ff King
re
a
d-cache: optionally disallow HFS+
.
git variant
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
J
e
ff
K
i
ng
utf8:
a
dd is_h
f
s_dotgit() helper
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
J
eff King
f
s
c
k
:
n
otice
.
git
c
a
s
e-insensitiv
e
ly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Je
f
f King
t14
5
0: refactor "
.
"
,
"
.
.
", and "
.
git" f
s
c
k
test
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
J
eff
King
verify_dot
f
ile
(
): reject
.
git
case-insensitive
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jeff
K
ing
read-tree: a
d
d tests fo
r
confusing paths li
k
e "
.
.
"
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jeff K
i
ng
un
p
ack-tre
e
s: propagate errors adding en
t
ries to t
h
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-10
Jef
f
Ki
n
g
read
_
pac
k
ed_refs: use
s
ki
p
_
p
r
efix instead of static
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-10
Jeff King
read_packed_refs: p
a
ss strb
u
f to parse_ref_l
i
ne
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-10
Jef
f
King
rea
d
_
pa
c
ked_refs: use a
s
trbuf for reading lines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-09
Ronald Wa
m
pler
g
it-am
.
t
x
t: --ign
o
re-date flag
i
s not passed
t
o git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-05
Ju
n
io
C
Hamano
M
e
rge
branch 'maint' of git://github
.
co
m
/g
i
t-l10n/gi
t
.
.
.
commit
|
commitdiff
|
tree
2014-12-05
Junio C Hamano
St
a
rt po
s
t 2
.
2 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-05
Jeff
K
ing
f
o
r_each_reflog_ent_rev
e
rse: tur
n
left
o
ver check into
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-05
Jeff King
for_each_reflog_ent_reverse: fix newl
i
nes on blo
c
k
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-01
Jeff King
push: truly use "simple
"
as defau
l
t, not
"
u
pstream"
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-26
M
a
r
c
Branchaud
RelNotes: spelling &
g
r
a
mmar tw
e
ak
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-26
Mike Hom
m
e
y
sha1_
n
am
e
: a
v
oid
u
n
n
ecessary sha1 lookup in find_unique_abbrev
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-21
Junio
C
H
amano
Git
2
.
2
.
0-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-21
Michael J Gruber
add:
i
gnore only ignored files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-20
Jeff King
t402
6
: test "n
o
rmal" colo
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-20
Jeff King
con
f
ig: fix par
s
ing of
"git config --get-
c
ol
o
r some
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-20
Jef
f
King
docs: describe ANS
I
256-color mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-19
Junio C Hamano
Merge
b
ranch 'sv/submitting
-
final-
p
atc
h
'
commit
|
commitdiff
|
tree
2014-11-19
J
u
nio C Hamano
Merge bran
c
h 's
n
/
t
utori
a
l-status-output-
e
xample'
commit
|
commitdiff
|
tree
2014-11-19
Junio C H
a
mano
M
e
rg
e
branch 'mh/d
o
c
-remote-helper-
x
ref
'
commit
|
commitdiff
|
tree
2014-11-19
Juni
o
C Hama
n
o
Merge
b
ran
c
h 't
b
/n
o
-relat
i
ve-file-ur
l
'
commit
|
commitdiff
|
tree
2014-11-19
Juni
o
C
H
a
m
a
n
o
Merge br
a
nch
'
c
c/int
e
rpret-trailers'
commit
|
commitdiff
|
tree
2014-11-18
Jeff Ki
n
g
gitweb: ha
c
k around CGI
'
s
l
ist-co
n
text param(
)
h
andling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-18
Jo
n
ath
a
n Nieder
Makefile: h
a
ve
p
ython scripts depend on NO_PYTHON s
e
tting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-18
J
o
n
a
than Nied
e
r
Makefile: simplify by usi
n
g
S
CRIPT_{PERL,SH}_GEN macros
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-18
Jun
i
o
C Hamano
M
e
rge git://github
.
com/git-
l
10n/git-po
commit
|
commitdiff
|
tree
2014-11-18
Juni
o
C
H
a
m
a
no
Merge bra
n
ch 'j
c
/d
o
c-com
m
it
-
only'
commit
|
commitdiff
|
tree
2014-11-18
J
u
nio C Hamano
M
erge branch 'ta/tutorial-moderniz
e
'
commit
|
commitdiff
|
tree
2014-11-18
J
u
nio C H
a
mano
Me
r
g
e
b
ranch 'da/difftool'
commit
|
commitdiff
|
tree
2014-11-18
Jeff King
t960[34
]
: mark cv
s
im
p
ort tests
a
s requiring perl
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-18
Jeff King
t
0090
:
mark add-in
t
e
r
ac
t
i
ve te
s
t with PERL prerequisite
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-18
Jeff Ki
n
g
Makefile: have perl scripts d
e
pend on
N
O
_
PERL settin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next