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 work tree fast-forward when fetch updates head
2015-05-29
Paul Tan
t5520:
test work tree fast-for
w
ard
w
hen fetch updates
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520
:
test f
o
r failure if index
ha
s
u
n
resolved
entries
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-18
Paul
T
an
t5520: tes
t
no merg
e
can
d
idates cases
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
t5520: prevent
f
ield sp
l
itting in content comparisons
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ha
m
ano
me
r
ge
:
deprecate
'
g
it m
e
rge <mess
a
ge> HEA
D
<commit
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: handle
F
ETCH_HE
A
D internally
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge
:
decide if we auto-generate the
messag
e
ea
r
l
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
u
n
io C Ha
m
ano
me
r
ge: m
a
ke collect_parent
s
() a
u
to-
g
en
e
ra
t
e t
h
e merge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
m
e
rge: extract prepar
e
_merge_me
s
sage() log
i
c ou
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C H
a
ma
n
o
merge: narrow scope of merge
_
names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o C Hamano
merge: spl
i
t re
d
uce_parents() out
o
f col
l
ec
t
_
p
a
rents(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
Ha
m
ano
merge: clarify collect_parents()
l
o
gic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C H
a
mano
m
erge: small leakfix and cod
e
simpl
i
fica
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C Hamano
mer
g
e: do not check argc to determi
n
e number
of
r
e
mote
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
i
o C Hamano
merge: c
l
arify
"
pulling int
o
void" special case
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C Hama
n
o
t5
5
20
:
te
s
t pulling an octopu
s
into a
n
un
b
orn branch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io C Hamano
t5520: s
t
yle fix
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: sim
p
l
ify code flow
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio C Hamano
merge: te
s
t the t
o
p-level mer
g
e
d
r
iver
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-01-12
J
u
nio
C Hamano
Git
2
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-01-12
Ju
n
io C Hamano
Merge branch 'jk/
r
e
a
d
-packed-ref
s
-wit
h
out-path-max
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio
C Hamano
Merge branch 'mg
/
a
d
d
-
ig
n
ore
-
er
r
or
s
' into ma
i
nt
commit
|
commitdiff
|
tree
2015-01-12
Junio C
Haman
o
Me
r
ge branch 'mh/find-
u
n
iq
-
abbrev' into m
a
int
commit
|
commitdiff
|
tree
2015-01-12
Junio C Hamano
M
erg
e
branch 'jk/approxidate-avoid-y-d-m
-
o
ver-future
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Jun
i
o
C
Hama
n
o
Merge branch
'
rw/apply-doe
s
-not-take-ignore-date' into
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio C Ham
a
no
Me
r
ge bra
n
ch
'
j
k/for
-
each-reflog-ent
-
revers
e
' into
.
.
.
commit
|
commitdiff
|
tree
2015-01-07
Jun
i
o C Hama
n
o
Me
r
ge branch 'maint-2
.
1' into
maint
commit
|
commitdiff
|
tree
2015-01-07
Junio
C Ham
a
no
M
erge branc
h
'maint-2
.
0'
i
nto maint-2
.
1
commit
|
commitdiff
|
tree
2015-01-07
Junio C Hamano
Me
r
ge bran
c
h 'mai
n
t
-1
.
9'
i
nto main
t
-
2
.
0
commit
|
commitdiff
|
tree
2015-01-07
Junio C Hama
n
o
Merge branch 'mai
n
t-1
.
8
.
5
' into maint-1
.
9
commit
|
commitdiff
|
tree
2015-01-07
Juni
o
C Hamano
M
er
g
e
br
a
nch 'jk
/
d
o
tgit-case-maint-1
.
8
.
5' in
t
o maint
.
.
.
commit
|
commitdiff
|
tree
2014-12-29
Jeff King
is_hfs_dotg
i
t: lo
o
sen over-e
a
ger match
o
f \
u
{
.
.
47}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-22
Junio
C
Hamano
Pr
e
pare fo
r
2
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-22
Junio C Ha
m
a
n
o
Merge branch 'jk/rebuil
d
-pe
r
l-scripts-with
-
n
o-perl
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Junio C H
a
mano
Merge branch
'
jk/
n
o-perl-tests'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Merge branch 'po/ev
e
ryda
y
-do
c
'
into m
a
i
n
t
commit
|
commitdiff
|
tree
2014-12-22
J
u
ni
o
C Hamano
Merge branch 'jk/push-simple' into maint
commit
|
commitdiff
|
tree
2014-12-22
Junio
C Ha
m
a
n
o
Merge branch 'mh/co
n
fig-flip-xbit-back-after-chec
k
i
n
g
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Junio C Haman
o
Mer
g
e branch 'jk/gi
t
web
-
w
i
th-newer-cgi-mul
t
i-
p
aram
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Junio C
H
amano
Merge b
r
a
nc
h
'rs/recei
v
e-
p
ack-use-lab
s
'
into
maint
commit
|
commitdiff
|
tree
2014-12-22
Ju
n
io C H
a
m
a
no
Merge bran
c
h
'rs/m
a
int-c
o
nfig-use-labs' into
m
ain
t
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Merge b
r
anch 'js/windows-open-eisd
i
r-error' into maint
commit
|
commitdiff
|
tree
2014-12-22
Junio
C
Hamano
Merge
b
ranch 'jk/colors
-
fix
'
in
t
o maint
commit
|
commitdiff
|
tree
2014-12-22
Ju
n
io C Hamano
Merge br
a
nch 'jk/
c
h
eckout-from-tree' in
t
o m
a
int
commit
|
commitdiff
|
tree
2014-12-22
Alexander
Ku
l
eshov
clean: typofix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Junio C H
a
mano
Git 2
.
2
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Junio C
H
amano
S
y
nc with v2
.
1
.
4
commit
|
commitdiff
|
tree
2014-12-17
Junio C
H
amano
G
it
2
.
1
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Junio
C Hama
n
o
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
Junio C
H
am
a
no
Sync with
v
1
.
9
.
5
commit
|
commitdiff
|
tree
2014-12-17
Junio C Hamano
G
it
1
.
9
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Ju
n
i
o 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
Jun
i
o C Hamano
Merge b
r
a
nch 'dotgit-ca
s
e-main
t
-1
.
8
.
5' into
maint-1
.
8
.
5
commit
|
commitdiff
|
tree
2014-12-17
J
o
han
n
es
S
chindelin
fsck: complain about
N
TFS "
.
g
it" aliases
in tre
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
J
o
hannes
S
chindelin
read-cach
e
:
optionally d
i
sa
l
low NTFS
.
g
i
t variants
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
J
o
hannes Schin
d
el
i
n
path: add is
_
ntfs_dotgit() hel
p
er
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
fsck: complain about H
F
S+
"
.
git" alias
e
s in tre
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
read
-
cache: optionally
d
is
a
llow HFS+
.
g
i
t
variants
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jef
f
K
ing
ut
f
8:
add is_hfs_dot
g
it() helper
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
J
e
f
f
K
ing
fsck: noti
c
e
.
git case-in
s
ensiti
v
ely
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Je
f
f King
t1450
:
ref
a
c
t
o
r "
.
"
,
"
.
.
"
,
and "
.
git"
fsck tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff Kin
g
verif
y
_dotf
i
le():
r
e
jec
t
.
git
case-insensiti
v
ely
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
read-tre
e
:
a
dd tests fo
r
confu
s
ing paths lik
e
"
.
.
"
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff
K
ing
u
npack-t
r
ees: pro
p
agate er
r
ors adding
en
t
ries to the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-10
Jeff King
read_packed_refs: u
s
e skip_p
r
efix in
s
tead of static
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-10
Jeff King
r
e
ad_packed_refs: p
a
ss strbuf to parse_
r
ef_line
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-10
Jeff King
read_packed_r
e
f
s
:
use a strbuf f
o
r reading lines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-09
Ronald
Wampler
gi
t
-
a
m
.
txt: --ig
n
ore-date
f
lag i
s
not passed to
g
i
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-05
Junio C Hamano
Merge branch 'maint' of
g
it://github
.
com/git-l10n/git
.
.
.
commit
|
commitdiff
|
tree
2014-12-05
Junio C Hamano
Start post
2
.
2 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-05
Jeff
Ki
n
g
for_each_reflog_ent_reve
r
se: turn left
o
ver check into
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-05
Jeff Kin
g
for_each_reflog_ent_revers
e
: fix new
l
ines on blo
c
k
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-01
Jef
f
King
push: truly use "
s
imple" a
s
default, not "upstream"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-26
Juni
o
C Hamano
Git 2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-26
Marc Branchaud
Re
l
Notes: s
p
elling & grammar twea
k
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-26
Mike Ho
m
mey
sha
1
_name: avoid unn
e
cessary sha1 lookup
i
n find_
u
niqu
e
_ab
b
rev
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-21
Junio C Hamano
G
it 2
.
2
.
0-
r
c3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-21
Michae
l
J
G
ru
b
e
r
add: ig
n
ore
only
ig
n
ored f
i
l
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-20
Jeff King
t40
2
6:
test
"
normal" c
o
lor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-20
Jeff K
i
ng
c
onf
i
g: fix par
s
ing of "git co
n
fig --get-color some
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-20
Jeff King
docs: descri
b
e
A
N
SI 25
6
-col
o
r mode
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-19
J
u
nio C H
a
man
o
M
erge
branch
'
s
v
/
submitting-final-p
a
tch'
commit
|
commitdiff
|
tree
2014-11-19
Jun
i
o
C Hamano
M
e
rge br
a
nch 'sn/tutori
a
l-status-output-example'
commit
|
commitdiff
|
tree
2014-11-19
J
uni
o
C Hama
n
o
Me
r
g
e bra
n
ch '
m
h/doc-remote-helper-xr
e
f'
commit
|
commitdiff
|
tree
2014-11-19
Junio C
Hamano
Merge br
a
n
c
h 'tb/no
-
relati
v
e-file-url'
commit
|
commitdiff
|
tree
2014-11-19
Junio C
H
a
mano
Merge branch '
c
c/
i
nterp
r
et-trailers'
commit
|
commitdiff
|
tree
2014-11-18
Jeff King
g
i
tweb: hack
aroun
d
CGI's list-context param() han
d
li
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Jonathan Nieder
Mak
e
f
i
le: have python
scri
p
ts
depend on NO_
P
YTH
O
N settin
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Jonatha
n
Nieder
Makefile: s
i
mpl
i
f
y
b
y
using S
C
RIPT_{PERL,SH
}
_GEN macros
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Junio
C Hamano
Me
r
ge git://gi
t
hub
.
com/git-l10n/git
-
po
commit
|
commitdiff
|
tree
2014-11-18
Junio C Hamano
M
erge
branch 'jc/doc
-
commit
-
only'
commit
|
commitdiff
|
tree
2014-11-18
J
u
n
i
o C
H
amano
Mer
g
e
branch 'ta/tutorial-mod
e
rn
i
ze'
commit
|
commitdiff
|
tree
2014-11-18
Junio
C
Haman
o
M
e
rge b
r
an
c
h 'da/difftool
'
commit
|
commitdiff
|
tree
2014-11-18
J
e
ff King
t960[34]: mar
k
cvsim
p
ort tests
as req
u
i
r
ing perl
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Jef
f
King
t
0
0
9
0: mark add-interactive te
s
t
with PERL pr
e
r
equis
i
te
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Jeff
King
Mak
e
fil
e
:
h
ave perl scripts depend on NO_PERL setting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Michael Haggerty
create_default_files(): don
'
t set u+x bit on $GIT_DIR
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-17
J
u
nio C Hamano
Merge branc
h
'mas
t
er
'
of git://gith
u
b
.
com/git-l10n
.
.
.
commit
|
commitdiff
|
tree
next