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
t5521: test --dry-run does not make any changes
2015-05-29
Paul Tan
t5521
:
t
es
t
--dry-run does not mak
e
a
n
y changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
P
a
ul Tan
t
5520: te
s
t
-
-rebase f
a
ilure on unborn branch wi
t
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul
Tan
t552
0
: test --rebas
e
w
i
th multiple bran
c
h
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Ta
n
t5520: te
s
t
work tre
e
fast-forwa
r
d
when
f
etch u
p
dates
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5
5
20: test
for f
a
i
l
ure
i
f
index has unresolved
entrie
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
t5520: test no merg
e
candidates cases
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
t5520: prevent field spl
i
tting in content
comparisons
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge
:
de
p
r
ecate 'git mer
g
e <message
>
HEAD <commit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
m
e
r
ge: handle FETCH_HEAD
i
n
terna
l
ly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio
C Ha
m
a
no
merge: decide
i
f we auto-generate the message early
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
Hamano
merg
e
: make collect_
p
arents
(
) auto-generate the
merge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C Hamano
merge
:
extrac
t
p
repa
r
e_m
e
rge
_
message() logic out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
a
m
ano
me
r
ge: narrow
s
cope o
f
merge_names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
unio C
H
amano
merge: split reduce_parents() out
o
f collect_
p
a
rents()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Hamano
merge:
clarify colle
c
t_
p
aren
t
s()
logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: small leakf
i
x and code si
m
plification
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
uni
o
C Hamano
merge: d
o
n
ot c
h
eck argc to determine number of remote
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
amano
mer
g
e
: cl
a
rify "pulling into
v
oid" sp
e
cial
c
ase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
unio C Ham
a
no
t
5
520: test pullin
g
an octopu
s
i
nto an unborn branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
amano
t552
0
: st
y
le fixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge
:
simplify c
o
de flow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o
C
H
a
mano
merge: test
t
he top
-
level merge drive
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-01-12
Junio C Ha
m
ano
Git 2
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-01-12
J
u
nio
C
Haman
o
Merg
e
branch 'jk/read-packed-refs-
w
i
thout-path-max
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Ju
n
i
o C Hamano
Me
r
ge branc
h
'mg/
a
d
d-i
g
no
r
e-
e
rrors' into
m
aint
commit
|
commitdiff
|
tree
2015-01-12
Jun
i
o
C
Hamano
Mer
g
e branch 'mh/find-uniq-abbrev
'
into ma
i
n
t
commit
|
commitdiff
|
tree
2015-01-12
Ju
n
i
o
C
Hamano
Merge branch 'jk/ap
p
roxidate-avoid-y-d-m-ov
e
r-f
u
ture
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
J
u
n
io C Hamano
Merge bra
n
c
h
'
rw/apply-does
-
not-take-ignore-da
t
e'
into
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
J
unio C Hamano
Merge branch '
j
k/for-each-reflog-ent-rever
s
e' into
.
.
.
commit
|
commitdiff
|
tree
2015-01-07
Junio C
Hamano
Me
r
ge branch 'main
t
-2
.
1' into maint
commit
|
commitdiff
|
tree
2015-01-07
J
u
n
io C Ham
a
no
Merge branch '
m
aint-2
.
0' in
t
o
maint-2
.
1
commit
|
commitdiff
|
tree
2015-01-07
Jun
i
o C Hamano
M
e
rge branch 'mai
n
t-1
.
9
'
i
nto maint-2
.
0
commit
|
commitdiff
|
tree
2015-01-07
Junio
C
Hamano
Merge branch
'
maint
-
1
.
8
.
5'
into m
a
int-1
.
9
commit
|
commitdiff
|
tree
2015-01-07
J
unio C
H
amano
Merge
b
ranch 'jk/dotgit-case
-
maint-1
.
8
.
5' into
m
aint
.
.
.
commit
|
commitdiff
|
tree
2014-12-29
Jeff
King
i
s
_
hfs
_
d
otgit: loos
e
n o
v
er-eager
m
a
t
ch of \u
{
.
.
4
7
}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-22
J
u
n
io C Hamano
P
r
epare for 2
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-22
Juni
o
C
Hamano
Merge
b
ranch '
j
k/rebuild-perl-scri
p
ts-
w
i
t
h
-no-perl
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Junio
C Hamano
Merge branch
'
jk/no-p
e
rl-tests' into ma
i
nt
commit
|
commitdiff
|
tree
2014-12-22
Junio C Haman
o
Merge b
r
anc
h
'
p
o/everyday
-
doc
'
into ma
i
nt
commit
|
commitdiff
|
tree
2014-12-22
J
unio C Ha
m
ano
Me
r
ge branch 'jk/pu
s
h
-
s
imp
l
e' into maint
commit
|
commitdiff
|
tree
2014-12-22
Junio C
Hamano
Merge bra
n
ch 'mh/config-flip-xbit
-
b
a
c
k-after-checki
n
g
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Juni
o
C Hamano
Merge
b
ranch 'jk/gitwe
b
-with-newer
-
cgi-multi-param
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Merge
b
ranc
h
'
r
s/recei
v
e
-
pack-use-labs'
into
main
t
commit
|
commitdiff
|
tree
2014-12-22
Junio
C Ha
m
a
n
o
M
erge br
a
nch 'rs/main
t
-config-u
s
e-labs' into maint
commit
|
commitdiff
|
tree
2014-12-22
Junio C
H
amano
Merge branch 'j
s
/wind
o
ws-open-eisdir-er
r
o
r
'
into maint
commit
|
commitdiff
|
tree
2014-12-22
Jun
i
o C
H
a
mano
Merge
branch 'jk/c
o
lors
-
f
i
x' i
n
t
o main
t
commit
|
commitdiff
|
tree
2014-12-22
Jun
i
o C Ha
m
ano
Me
r
ge bra
n
ch 'jk/check
o
ut-from-tree' in
t
o maint
commit
|
commitdiff
|
tree
2014-12-22
Alexander Ku
l
eshov
c
l
ean: typof
i
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Ju
n
io C H
a
ma
n
o
G
i
t
2
.
2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Ju
n
i
o C Hamano
S
y
n
c with 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 H
a
m
ano
Sync
w
ith v2
.
0
.
5
commit
|
commitdiff
|
tree
2014-12-17
J
unio C Hama
n
o
Git 2
.
0
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jun
i
o C Hama
n
o
Sync with v1
.
9
.
5
commit
|
commitdiff
|
tree
2014-12-17
Juni
o
C
H
aman
o
Git 1
.
9
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Junio C Hamano
Sync
w
ith v
1
.
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
Merge
b
ranch 'dotgit-ca
s
e-mai
n
t-1
.
8
.
5
' into maint-1
.
8
.
5
commit
|
commitdiff
|
tree
2014-12-17
Johannes Schindelin
f
sck: c
o
mplain about NTFS "
.
git
"
a
l
iases in tr
e
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Johannes
S
chinde
l
in
read-cache: optionally disallow NTF
S
.
git varian
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Johannes Schind
e
lin
path: add is_n
t
fs_dotgit()
helper
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
fsc
k
: co
m
pla
i
n a
b
out H
F
S
+
"
.
git
"
aliases in tre
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
J
e
ff King
r
e
ad
-
cac
h
e: optiona
l
ly disallow HFS+
.
git variants
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
J
eff
K
i
ng
u
t
f8: add is_hfs_dotgit() helper
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
f
sck: no
t
ice
.
git case-i
n
sensitively
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
t
1450: refactor
"
.
", "
.
.
", and "
.
git" fsck te
s
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
v
e
rify_dotfile(): r
e
ject
.
git
case
-
ins
e
nsitively
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jeff Ki
n
g
read-tr
e
e:
a
dd tests f
o
r confusing pa
t
hs like "
.
.
"
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jeff
K
ing
unpack-trees: propagat
e
e
r
ro
r
s add
i
ng entri
e
s
t
o
t
he
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-10
Jeff King
read_packed_ref
s
: use skip_prefix i
n
stead of static
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-10
Jeff King
r
e
ad_p
a
cked_
r
e
f
s
:
pass strbuf
t
o
par
s
e
_re
f
_line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-10
Jeff King
read_pack
e
d_refs: use a strbuf
f
or reading
l
ines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-09
Ronald
W
ampler
git-am
.
t
x
t: --ignore-da
t
e flag is
n
ot passed to git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-05
J
u
nio C Ham
a
no
Merge b
r
a
n
ch 'maint' of git://github
.
com/git
-
l10n/g
i
t
.
.
.
commit
|
commitdiff
|
tree
2014-12-05
Junio C Hamano
Start pos
t
2
.
2 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-05
Jef
f
King
f
or_each_
r
eflog_ent_reverse: turn
l
eft
o
v
e
r check into
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-05
Jeff
K
ing
f
o
r_
e
a
c
h_refl
o
g_ent_re
v
erse
:
fi
x
n
e
w
lines o
n
block
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-01
Jef
f
King
push: truly use "
s
imple
"
as de
f
ault, n
o
t "
u
pstream"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-26
J
u
ni
o
C
Hamano
Git 2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-26
Marc Branchaud
RelN
o
tes: spelling & g
r
ammar tweaks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-26
Mike Hommey
sha1_nam
e
: avoid unnecessary sh
a
1
l
o
ok
u
p
i
n
find_un
i
que_abbrev
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-21
Jun
i
o C Ham
a
no
Git 2
.
2
.
0-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-21
M
i
c
h
a
el J Gruber
a
dd: ign
o
re only ignored files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-20
Jeff King
t
4
02
6
: test "n
o
rmal"
c
olor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-20
Jeff King
conf
i
g: fix parsing of "git config
--ge
t
-color some
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-20
J
eff King
docs: describe
ANSI 25
6
-c
o
l
or mo
d
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-19
J
u
nio C Ham
a
n
o
Me
r
ge branch
'
sv/submitti
n
g-final-patch'
commit
|
commitdiff
|
tree
2014-11-19
Junio C Hamano
Merge branch
'sn/tutorial-s
t
atus
-
output-e
x
ample'
commit
|
commitdiff
|
tree
2014-11-19
Junio C H
a
mano
Merge b
r
anch 'mh/doc-remote-he
l
per-xref'
commit
|
commitdiff
|
tree
2014-11-19
J
u
nio C Hamano
M
e
rge branch 'tb/no-relativ
e
-file-u
r
l
'
commit
|
commitdiff
|
tree
2014-11-19
Jun
i
o C Hamano
Merge branch
'cc/inter
p
ret-t
r
ailers
'
commit
|
commitdiff
|
tree
2014-11-18
Jeff K
i
ng
g
itweb: h
a
c
k
around CGI's l
i
st-
c
ontext param() handling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-18
Jonathan Nieder
Makefile: have python scripts depend
o
n NO_PYTHON se
t
ting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-18
Jonathan Nieder
Makefile: simplify by using SCRIPT_{PERL,
S
H}_GEN macros
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-18
Juni
o
C Hamano
M
erge git://github
.
com/git-l1
0
n/
g
it-po
commit
|
commitdiff
|
tree
2014-11-18
Junio
C
Hamano
Me
r
g
e branch 'jc/
d
oc-c
o
mmit-only'
commit
|
commitdiff
|
tree
2014-11-18
Ju
n
io C Hamano
Merg
e
branch 'ta/tuto
r
ial
-
m
o
de
r
nize'
commit
|
commitdiff
|
tree
2014-11-18
Junio C Ham
a
no
M
e
rge
br
a
n
c
h 'd
a
/d
i
fftool'
commit
|
commitdiff
|
tree
2014-11-18
Jeff King
t960[3
4
]:
mark cvsimport
tests as requiri
n
g
p
erl
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-18
Jeff K
i
n
g
t0090:
mark add-interact
i
ve te
s
t with
P
ERL prere
q
uisi
t
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next