repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t5520: check reflog action in fast-forward merge
2015-05-29
Paul Tan
t5
5
20: c
h
eck reflo
g
action in fast-forwa
r
d m
e
rge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Ta
n
t5521:
test --d
r
y
-run
d
oes no
t
make an
y
chan
g
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t
5520:
test --rebase f
a
ilure on u
n
bo
r
n b
r
anch with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Pau
l
Ta
n
t5520: test --rebase with multip
l
e branche
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Ta
n
t5520: test work tree fast-
f
orward when fetch
u
p
date
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520: te
s
t for failur
e
if index has unresolved
entries
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-18
Pau
l
Tan
t5
5
20: test
n
o merge
c
and
i
dates cases
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-18
P
a
ul Tan
t5520: preven
t
f
i
el
d
spli
t
ting in content comparisons
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
mer
g
e: deprecate 'git merge <message> H
E
AD <commit
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
u
n
i
o C
Ham
a
no
merg
e
: hand
l
e FETC
H
_HEAD internally
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
me
r
ge: d
e
c
ide if we auto
-
generate the
m
essage early
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ham
a
no
merge: make
col
l
ec
t
_
parents() auto-gene
r
ate the mer
g
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C H
a
mano
m
e
rge: extr
a
ct
prepare_merge_mess
a
ge() logi
c
out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio C Haman
o
mer
g
e: nar
r
ow sco
p
e of merge_n
a
mes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
aman
o
merge: split reduce_p
a
r
e
nts() out of collect_parents()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Haman
o
merge: clarify c
o
llect_parents() lo
g
ic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: small leak
f
ix and code simplifica
t
io
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
mer
g
e: do not c
h
e
c
k
argc to de
t
ermine number o
f
rem
o
te
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
u
n
io C Hamano
m
e
rge: cl
a
rify "pullin
g
into v
o
id"
sp
e
c
i
a
l case
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o
C
H
amano
t5520: test pulling an octopus into a
n
unborn b
r
anc
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
t5520:
style f
i
xes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: simpli
f
y code flow
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
unio
C
Hamano
mer
g
e: test the top-level m
e
rge driver
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
r
anch
'j
k
/read-packed-
r
efs
-
without-pat
h
-m
a
x
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio
C
Ham
a
no
Merge branch
'
mg
/
add-ign
o
re-errors' into
m
aint
commit
|
commitdiff
|
tree
2015-01-12
Junio C
H
a
m
ano
Me
r
ge branch 'mh/find
-
uniq-abbre
v
' into maint
commit
|
commitdiff
|
tree
2015-01-12
Junio C Hamano
Merge br
a
nc
h
'jk/approxidate-avoid-
y
-d-m-over-future
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Jun
i
o
C Hamano
M
e
r
ge b
r
anch 'rw
/
apply-does
-
no
t
-take-ignore-date
'
into
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio C Hamano
Merge branch 'jk/for
-
each-re
f
l
o
g-ent-reverse' into
.
.
.
commit
|
commitdiff
|
tree
2015-01-07
Junio C
H
amano
Merg
e
branch 'maint-2
.
1' into maint
commit
|
commitdiff
|
tree
2015-01-07
J
u
nio C Hamano
Merge bra
n
ch 'maint-2
.
0' in
t
o maint
-
2
.
1
commit
|
commitdiff
|
tree
2015-01-07
Junio
C
Ha
m
a
n
o
Merge br
a
n
ch 'mai
n
t-1
.
9' into maint-2
.
0
commit
|
commitdiff
|
tree
2015-01-07
Junio C Hama
n
o
Mer
g
e b
r
anch 'mai
n
t-
1
.
8
.
5' into maint-1
.
9
commit
|
commitdiff
|
tree
2015-01-07
Junio C
H
a
m
ano
Merge b
r
anch 'j
k
/dotgit
-
case-main
t
-1
.
8
.
5
' in
t
o maint
.
.
.
commit
|
commitdiff
|
tree
2014-12-29
Jeff King
is_hfs_do
t
git: loosen over-eager match o
f
\u
{
.
.
47
}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-22
Junio C
Hama
n
o
Pr
e
pare for
2
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-22
J
unio C Hamano
Merge branch 'jk/rebuil
d
-
perl-scripts-with-no-perl
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Ju
n
io C H
a
mano
Merge branch '
j
k
/no-perl-tests' in
t
o maint
commit
|
commitdiff
|
tree
2014-12-22
Junio C Ha
m
ano
M
erge branch 'po/every
d
ay-doc' into maint
commit
|
commitdiff
|
tree
2014-12-22
Junio
C Ha
m
a
no
Me
r
ge branch 'jk/push
-
simple'
i
nto maint
commit
|
commitdiff
|
tree
2014-12-22
J
u
nio C Ha
m
ano
Merge bran
c
h
'
mh/config
-
flip-x
b
it-back-afte
r
-checking
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
J
u
nio C
H
amano
Merge branch 'jk/
g
itw
e
b-with-ne
w
er-cgi-m
u
lti-param
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Juni
o
C Hamano
Merge branch 'rs/re
c
ei
v
e-pack
-
us
e
-la
b
s'
in
t
o maint
commit
|
commitdiff
|
tree
2014-12-22
J
uni
o
C
H
amano
Merge bran
c
h 'rs/maint-co
n
fig-use-labs' into ma
i
nt
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hama
n
o
Mer
g
e branch 'js/windows-
o
pe
n
-
e
isdir-error'
into maint
commit
|
commitdiff
|
tree
2014-12-22
Junio
C
Hamano
Me
r
ge branch 'j
k
/colors
-
f
i
x' into main
t
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Merge
b
ran
c
h 'j
k
/checkout-fr
o
m-tree
'
i
n
t
o
maint
commit
|
commitdiff
|
tree
2014-12-22
A
lexa
n
de
r
Kuleshov
clean: typ
o
fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Junio C H
a
m
a
n
o
Git 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
ith
v
2
.
1
.
4
commit
|
commitdiff
|
tree
2014-12-17
Jun
i
o C Hamano
Git 2
.
1
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Junio C H
a
mano
Sync with
v
2
.
0
.
5
commit
|
commitdiff
|
tree
2014-12-17
Ju
n
io C Haman
o
G
it 2
.
0
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Juni
o
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
Ju
n
i
o C Hamano
Sync with v
1
.
8
.
5
.
6
commit
|
commitdiff
|
tree
2014-12-17
J
u
n
io 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
Merge branch 'dotgi
t
-
case
-
maint-1
.
8
.
5' into ma
i
nt-1
.
8
.
5
commit
|
commitdiff
|
tree
2014-12-17
Joh
a
nnes S
c
hin
d
elin
fsck: complain about NTFS "
.
git
"
a
liases in tree
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Johannes Sch
i
ndelin
read-ca
c
he: optionally
disallow
NTFS
.
g
it varia
n
ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Johannes Sc
h
indel
i
n
path: add is_ntfs_dotgit()
h
elp
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
f
s
ck
:
comp
l
ain ab
o
ut HFS+ "
.
git" a
l
iases in trees
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Je
f
f
King
read-cache: o
p
tionally disal
l
ow HFS+
.
git
va
r
iants
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
J
eff King
utf8: add
is_hfs_dotgit() help
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
J
e
f
f
K
i
ng
fsck: not
i
ce
.
git case-inse
n
sitive
l
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
J
eff
K
ing
t145
0
: r
e
factor "
.
", "
.
.
", an
d
"
.
git" fsc
k
tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
verif
y
_
dotfile(): reject
.
git
c
ase-insensitively
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
read-tr
e
e: add tests fo
r
confusing paths like "
.
.
"
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
J
e
ff King
u
npack-tree
s
: propagat
e
errors adding entries to the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-10
Jeff King
re
a
d_packed_refs
:
use ski
p
_p
r
efix
instead of st
a
tic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-10
Jeff King
read_packed_refs:
p
ass
strbuf to pa
r
se_ref_lin
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-10
Jeff K
i
ng
re
a
d_packed
_
re
f
s: use a strbuf for
r
eading
li
n
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-09
Ronald Wamp
l
er
gi
t
-a
m
.
txt: --igno
r
e
-date flag
i
s not pa
s
s
e
d to git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-05
Junio C Hamano
Merge branch
'
maint' of git://gith
u
b
.
com/git-l10n/git
.
.
.
commit
|
commitdiff
|
tree
2014-12-05
Junio
C
Hamano
Start post 2
.
2
c
yc
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-05
Jeff Kin
g
for_each_reflo
g
_en
t
_reverse: tur
n
leftover c
h
e
ck
into
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-05
Jeff King
for
_
ea
c
h_reflog_ent_reverse: fix
newlin
e
s on b
l
oc
k
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-01
Je
f
f King
pu
s
h:
t
ruly u
s
e
"si
m
ple" as default, not "u
p
stream"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-26
Jun
i
o C H
a
mano
Git
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-26
M
a
rc Branchaud
RelNotes: spel
l
in
g
& gram
m
a
r tweaks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-26
Mike Ho
m
mey
sha1_
n
ame: a
v
oid unnecessary sha1
l
ookup in fi
n
d_unique_abbre
v
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-21
Juni
o
C Hamano
Git 2
.
2
.
0
-
rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-21
M
ichae
l
J
G
r
u
ber
add:
i
gnor
e
o
nly igno
r
ed
files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-20
Je
f
f
King
t4026: test "normal"
c
ol
o
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-20
Jeff Ki
n
g
config: fix parsing o
f
"
g
i
t conf
i
g --get-col
o
r s
o
me
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-20
Jeff King
d
ocs: describe ANSI 256-
c
olor m
o
de
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-19
Junio C H
a
mano
Merge
b
r
a
nch
'
s
v
/submitting
-
f
i
nal-patch'
commit
|
commitdiff
|
tree
2014-11-19
J
u
nio C H
a
mano
Me
r
g
e
bra
n
ch 's
n
/tutorial-
s
ta
t
us-output-example'
commit
|
commitdiff
|
tree
2014-11-19
Junio C Ham
a
no
M
erge branch 'mh/doc
-
r
e
m
o
te-helper-xref'
commit
|
commitdiff
|
tree
2014-11-19
Junio C Hamano
Merge branch 'tb
/
no-
r
el
a
tive-file-ur
l
'
commit
|
commitdiff
|
tree
2014-11-19
Junio C Ha
m
ano
Merge b
r
anc
h
'cc/interpr
e
t-trailers'
commit
|
commitdiff
|
tree
2014-11-18
Je
f
f King
g
itweb: hack arou
n
d CGI's list-co
n
t
ext
p
aram() han
d
l
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Jonathan Nieder
Mak
e
f
i
l
e
: have python
s
c
r
ipts
depen
d
o
n NO
_
P
Y
THON sett
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
J
onathan Nieder
Makefi
l
e: simplify by using SCR
I
P
T
_
{PERL,SH}_GEN ma
c
ros
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Junio C
H
a
m
a
n
o
Mer
g
e
g
it:/
/
github
.
com/git-l10n
/
g
i
t-po
commit
|
commitdiff
|
tree
2014-11-18
Junio C Ha
m
ano
Merge branch 'jc/doc-commit-only'
commit
|
commitdiff
|
tree
2014-11-18
J
unio C Hamano
Mer
g
e
branch 'ta/tut
o
r
i
a
l
-modernize'
commit
|
commitdiff
|
tree
2014-11-18
Junio C Hamano
Merge bra
n
ch
'
da/difftool'
commit
|
commitdiff
|
tree
2014-11-18
Jeff K
i
ng
t9
6
0[34]: mark cvsimport tes
t
s
a
s r
e
quiring perl
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next