repo.or.cz
/
git
/
mingw
/
j6t.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 Tan
t5520: test --
r
ebas
e
failur
e
on
u
nborn branch
with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5
5
20:
t
est --rebase with multiple branches
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
P
aul Tan
t55
2
0: test work
t
re
e
fast-forward
w
hen fe
t
c
h
updates
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520: test for failur
e
if inde
x
has un
r
e
s
olved entries
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-18
Paul
Tan
t5520:
t
e
st
no
merge
candidates cases
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-18
Paul Ta
n
t5520: p
r
event fie
l
d splitting in content comparisons
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Hamano
m
e
rge: deprecate '
g
it merge <message> HEAD
<c
o
mmi
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
unio C H
a
mano
merge: ha
n
dle FETCH
_
H
E
AD
intern
a
ll
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: decide if we
a
uto-generate the
message early
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
H
a
m
ano
m
erge: make coll
e
ct_par
e
nts() au
t
o
-
ge
n
e
rate the merge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio C
H
amano
merge: e
x
tr
a
ct pre
p
a
re_m
e
r
ge_messa
g
e() logic out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C Hamano
merge: narrow sc
o
pe of merge_nam
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: split reduce_par
e
n
ts
(
) out of c
o
ll
e
ct_
p
ar
e
n
t
s
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: clarif
y
collect_parents() logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C Ham
a
no
merge:
s
mall l
e
akfix
and code simplif
i
cation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C Hamano
merge: do not check ar
g
c to det
e
r
m
ine n
u
mber of rem
o
te
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Haman
o
merge: c
l
arify
"
p
ulling into v
o
id" special c
a
se
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
u
n
i
o C Hamano
t5520: test pullin
g
an octopus into an unbor
n
branch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
t55
2
0: style fix
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io
C
Hama
n
o
me
r
ge: si
m
plify code flow
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
me
r
ge: test the top-l
e
vel
merge dri
v
er
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-01-12
Junio C H
a
m
ano
G
it 2
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-01-12
J
unio
C
Hamano
Merge branch '
j
k/read-pa
c
ked-refs-wi
t
hout-path
-
m
ax
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Juni
o
C Hamano
Merge branch 'mg/add-ignore-errors' into maint
commit
|
commitdiff
|
tree
2015-01-12
J
unio C Ha
m
ano
Merge br
a
nch
'
mh/f
i
nd-uniq-abbrev' into maint
commit
|
commitdiff
|
tree
2015-01-12
J
u
nio C Hamano
Merge
b
r
an
c
h 'jk/approxidate
-
avoid-y-d-m
-
over-future
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio
C Hamano
Merge b
r
anch 'rw/apply-does-
n
ot-take-ignore-d
a
te'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio
C Ham
a
no
Me
r
ge branch 'jk/for-each
-
reflog-
e
nt-re
v
erse' into
.
.
.
commit
|
commitdiff
|
tree
2015-01-07
Ju
n
io C
H
aman
o
Merge bran
c
h
'
m
a
int-2
.
1' into main
t
commit
|
commitdiff
|
tree
2015-01-07
Junio
C Hamano
Mer
g
e branch 'maint-
2
.
0
'
in
t
o maint-2
.
1
commit
|
commitdiff
|
tree
2015-01-07
Junio C
Hamano
Merge
br
a
nch 'ma
i
nt-1
.
9' into mai
n
t-2
.
0
commit
|
commitdiff
|
tree
2015-01-07
J
uni
o
C Hamano
Mer
g
e branch
'maint
-
1
.
8
.
5
'
in
t
o maint-1
.
9
commit
|
commitdiff
|
tree
2015-01-07
J
unio C Hamano
M
erge
b
ra
n
ch
'
jk/dotgit-case-maint-1
.
8
.
5' i
n
to maint
.
.
.
commit
|
commitdiff
|
tree
2014-12-29
Jef
f
King
is
_
hfs_dotgit: loose
n
o
v
e
r-eager
m
atch of \u{
.
.
47}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
P
r
epar
e
for 2
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-22
J
unio C Hamano
Me
r
g
e b
r
anch 'jk/rebui
l
d-perl-scripts-with-n
o
-perl
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Junio C
Ha
m
ano
Merge bra
n
ch 'jk/no-perl-tes
t
s' i
n
t
o
maint
commit
|
commitdiff
|
tree
2014-12-22
Junio C
H
a
m
a
n
o
Merge branch 'po/everyday-doc' into ma
i
nt
commit
|
commitdiff
|
tree
2014-12-22
Jun
i
o C Hamano
Me
r
ge bra
n
ch
'
jk/push-simple' i
n
to maint
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
M
erge b
r
a
n
c
h
'mh/co
n
f
i
g
-
flip
-
xbit-back-
a
fter-ch
e
cking
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Junio C
Hamano
Merge branch 'jk/gitweb-wi
t
h
-
newer
-
cgi-mul
t
i-param
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Junio
C Hamano
Mer
g
e
branch '
r
s/receive-
p
ack
-
use-labs' into maint
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hama
n
o
Merge branch '
r
s/maint
-
config-use-l
a
bs' into maint
commit
|
commitdiff
|
tree
2014-12-22
Ju
n
io C
H
amano
M
e
rge
b
r
anch 'js/
w
indows
-
op
e
n
-
eisdir-error'
i
n
to maint
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Merg
e
br
a
nch '
j
k/colors-
f
i
x
' i
n
to maint
commit
|
commitdiff
|
tree
2014-12-22
Ju
n
io
C
H
ama
n
o
M
erge
branch 'jk/check
o
u
t-from-tree' i
n
to
m
aint
commit
|
commitdiff
|
tree
2014-12-22
Alexa
n
der K
u
leshov
clean
:
t
y
po
f
ix
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
Syn
c
w
ith v2
.
1
.
4
commit
|
commitdiff
|
tree
2014-12-17
Junio
C
Hamano
Git 2
.
1
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Junio C Haman
o
S
ync with v2
.
0
.
5
commit
|
commitdiff
|
tree
2014-12-17
Junio C Haman
o
Git 2
.
0
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Junio C Hamano
Sync
w
ith v
1
.
9
.
5
commit
|
commitdiff
|
tree
2014-12-17
Ju
n
io C Hamano
G
i
t
1
.
9
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Ju
n
io
C
Ham
a
no
Sy
n
c 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
Me
r
g
e
branch 'dotg
i
t-ca
s
e
-maint-1
.
8
.
5' into maint-1
.
8
.
5
commit
|
commitdiff
|
tree
2014-12-17
Johannes Schinde
l
in
fsck:
compl
a
in about NTFS "
.
g
it" ali
a
ses in tr
e
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Johannes Schindelin
read-ca
c
he: optionally
disallow NTFS
.
git variants
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Johannes Schindelin
path: add is_ntfs_dotgit() help
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
fsck: complain abou
t
HFS+ "
.
git" aliases in t
r
ees
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
J
e
ff
K
i
n
g
read-cache: optionally d
i
sallow HFS+
.
git var
i
ants
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
u
t
f
8: add is_hf
s
_
dotgit() help
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
fsck: notice
.
git ca
s
e-insensitively
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
t1450: refact
o
r "
.
",
"
.
.
", and "
.
git" f
s
ck
tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff Kin
g
verify
_
dotf
i
le(): reject
.
git c
a
se-
i
n
s
e
n
si
t
ively
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
read-tree: add t
e
s
ts for confusing paths like "
.
.
"
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
J
e
ff Kin
g
unpack-trees:
propa
g
ate er
r
o
rs adding entrie
s
to the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-10
Jeff
K
ing
read_pa
c
ked_refs: use skip_p
r
efix instead o
f
s
tatic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-10
J
eff King
r
e
ad_p
a
cked_refs: pass
strbuf
t
o parse_ref_li
n
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-10
Jeff King
read_packed
_
refs: use a s
t
r
buf for r
e
ading
lines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-09
Ronald Wampl
e
r
git-am
.
txt: --ignore-date
flag is
not passed to git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-05
J
u
nio C
H
a
mano
Merge
branch 'maint' of
g
it://github
.
com/git-l10n/git
.
.
.
commit
|
commitdiff
|
tree
2014-12-05
Junio
C
Hama
n
o
Start
p
ost
2
.
2 cyc
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-05
Jeff King
fo
r
_each_reflog_ent_rev
e
rse: turn leftover check into
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-05
Jeff King
for
_
e
ach_reflog_ent_reve
r
s
e
:
f
ix newline
s
on block
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-01
Jeff Kin
g
push
:
truly use "simple"
as defaul
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
Marc
B
ran
c
haud
Rel
N
otes: spelling & grammar tweaks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-26
Mike H
o
mm
e
y
sha
1
_name: a
v
oid un
n
ec
e
ssary sha1 loo
k
up in f
i
nd_
u
niqu
e
_abbr
e
v
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-21
Junio C Hamano
Git 2
.
2
.
0-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-21
M
i
chael J Grub
e
r
a
d
d: ignore only ignored files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-20
Jeff Kin
g
t4
0
2
6
:
test "normal" color
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-20
Je
f
f K
i
n
g
config: fix parsing of "g
i
t config --get-color some
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-20
Jeff King
docs: d
e
scrib
e
ANSI 256
-
color mode
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-19
Junio C Hama
n
o
Mer
g
e branch 'sv/su
b
m
itting-fin
a
l-patch'
commit
|
commitdiff
|
tree
2014-11-19
Junio C
Hamano
Merge br
a
nch 'sn
/
tutorial-st
a
tus-out
p
ut-ex
a
mple'
commit
|
commitdiff
|
tree
2014-11-19
Juni
o
C Hamano
Me
r
g
e bra
n
ch 'mh/doc-
r
emot
e
-
he
l
per-xref'
commit
|
commitdiff
|
tree
2014-11-19
Junio C Hamano
Me
r
ge branch 'tb/no-relative-fi
l
e-url'
commit
|
commitdiff
|
tree
2014-11-19
Junio
C Hamano
Merge branch 'cc/interpre
t
-
tra
i
le
r
s'
commit
|
commitdiff
|
tree
2014-11-18
Jeff King
g
i
tweb: hack around CGI's
l
i
st-context para
m
(
) handling
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Jonathan Ni
e
der
Ma
k
efile
:
have python
scripts depend o
n
NO_PYTH
O
N se
t
ting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Jonathan Nieder
Mak
e
file: simplify
b
y
using SCRIPT_{PERL,S
H
}_
G
E
N
macros
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Junio C Hama
n
o
Merge git://github
.
com
/
g
it-l10n/g
i
t-po
commit
|
commitdiff
|
tree
2014-11-18
Junio
C Hamano
M
e
rge branc
h
'jc/doc-
c
ommit-only'
commit
|
commitdiff
|
tree
2014-11-18
Junio C
H
amano
M
e
r
g
e bra
n
ch '
t
a/tutori
a
l-moderni
z
e'
commit
|
commitdiff
|
tree
2014-11-18
Junio C Hamano
Merg
e
bran
c
h 'da/difftool'
commit
|
commitdiff
|
tree
2014-11-18
Jeff Ki
n
g
t9
6
0
[
34]: mark
c
vsimport t
e
sts
a
s requiring perl
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Jeff King
t0090
:
mark
a
dd
-
interactive test with
PERL
p
rerequisite
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Jef
f
King
Makef
i
l
e
:
have perl sc
r
ipts depen
d
o
n
NO_PERL setting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next