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 for failure if index has unresolved entries
2015-05-29
Paul Tan
t5520:
t
est
f
or failure if index has unreso
l
ved entr
i
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-18
Paul T
a
n
t5
5
2
0:
test no merge ca
n
didates cases
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-18
Paul
T
an
t5520:
p
r
e
vent fiel
d
splitting
i
n content comparisons
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio C H
a
mano
merge: deprecate 'git merge
<mess
a
ge> HEAD <c
o
m
mit
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io C Hamano
merge
:
ha
n
d
l
e FETCH_HEAD in
t
ernally
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: decide
i
f we auto-gene
r
ate the
m
e
ss
a
ge
ea
r
l
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
u
ni
o
C Hamano
mer
g
e: make collect
_
p
a
rents() auto-
g
en
e
rat
e
the me
r
ge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o C Ham
a
no
merge
:
extra
c
t prepare_merge_m
e
ssage() logic o
u
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
m
e
r
ge:
narr
o
w sco
p
e of m
e
rg
e
_names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ha
m
a
n
o
merge: spl
i
t
r
e
d
uc
e
_p
a
rents() out
of collect
_
parents()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: cl
a
rify col
l
ect_paren
t
s
() logi
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: small
l
eakfix an
d
cod
e
simp
l
ification
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
u
n
io C Haman
o
me
r
ge:
do n
o
t
c
heck argc t
o
determine number of remote
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C
Haman
o
mer
g
e: clarif
y
"pulling into
voi
d
" spe
c
ial c
a
s
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
Hamano
t
5520:
t
e
st
pulling a
n
octopus
i
nto an
u
nbo
r
n bran
c
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Hamano
t5520: 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
J
u
n
io C Hamano
merg
e
:
t
est the top-leve
l
merge drive
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-01-12
J
u
nio
C Hamano
Gi
t
2
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-01-12
Junio C Hamano
Merge branc
h
'jk/read-p
a
ck
e
d-refs-with
o
ut-pat
h
-
m
a
x
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
J
unio C Hamano
Merge b
r
anch
'
m
g
/add-ignor
e
-errors
'
into maint
commit
|
commitdiff
|
tree
2015-01-12
Junio C Hamano
Merge branch 'mh/f
i
nd
-
u
n
iq-abbrev' into maint
commit
|
commitdiff
|
tree
2015-01-12
J
u
nio C
H
ama
n
o
Merge
b
ran
c
h
'jk
/
approxidat
e
-avoid-y-d
-
m-over-future
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio C Hamano
Mer
g
e
b
ranch
'
r
w/apply-does
-
not-take-
i
gn
o
r
e
-d
a
te' into
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Jun
i
o C Hamano
Mer
g
e b
r
anch 'jk/for
-
each-reflog-ent
-
rever
s
e' into
.
.
.
commit
|
commitdiff
|
tree
2015-01-07
J
u
nio C
H
a
man
o
Merge bra
n
c
h
'
m
aint
-
2
.
1
'
into ma
i
nt
commit
|
commitdiff
|
tree
2015-01-07
Junio C Hamano
Merge b
r
a
n
c
h 'maint-2
.
0'
i
n
t
o
main
t
-2
.
1
commit
|
commitdiff
|
tree
2015-01-07
Junio C Ha
m
ano
Merge
branch 'maint-1
.
9'
i
nto
m
a
int-2
.
0
commit
|
commitdiff
|
tree
2015-01-07
Junio
C
Ha
m
ano
Merge
branch 'maint-1
.
8
.
5' into ma
i
nt-1
.
9
commit
|
commitdiff
|
tree
2015-01-07
J
un
i
o C Ham
a
no
Merge branch 'j
k
/dotgit-case-
m
aint-1
.
8
.
5' into main
t
.
.
.
commit
|
commitdiff
|
tree
2014-12-29
J
e
ff King
is_hfs_dotgit:
loosen over-eager ma
t
ch of \u{
.
.
47}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-22
J
u
n
io C H
a
m
ano
Prepa
r
e for 2
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-22
Junio C Ha
m
ano
M
erge branch 'jk/rebu
i
ld-perl
-
scrip
t
s-with-
n
o-
p
erl
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
J
u
nio
C
Hamano
Merge br
a
nch 'jk/no-p
e
rl-test
s
' i
n
to maint
commit
|
commitdiff
|
tree
2014-12-22
Junio C Ham
a
n
o
Merge branch 'po/ev
e
ry
d
a
y
-doc' into main
t
commit
|
commitdiff
|
tree
2014-12-22
Ju
n
io C Hamano
Merge branch 'jk/push-simple' into maint
commit
|
commitdiff
|
tree
2014-12-22
J
unio C Hamano
Merge branch 'mh/config-f
l
ip-xbit-back-after
-
ch
e
ckin
g
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Junio
C
H
amano
M
e
rge branch 'jk/
g
i
t
web-with-newer-cg
i
-multi-param
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Junio
C
Hama
n
o
Me
r
ge branc
h
'rs/receive-pack-use-labs' int
o
maint
commit
|
commitdiff
|
tree
2014-12-22
Junio C
Ha
m
ano
Merg
e
b
r
anc
h
'rs/maint-
c
o
n
fig-use-labs' into maint
commit
|
commitdiff
|
tree
2014-12-22
Junio C Ham
a
no
Merge bra
n
ch
'
js/win
d
ows
-
o
p
e
n
-
e
isdir-error' into maint
commit
|
commitdiff
|
tree
2014-12-22
Junio C H
a
man
o
Me
r
ge branch 'j
k
/co
l
o
rs-fix' into
m
aint
commit
|
commitdiff
|
tree
2014-12-22
Junio C Ha
m
ano
M
e
rge br
a
nch 'jk/checkout
-
f
ro
m
-tree
'
into maint
commit
|
commitdiff
|
tree
2014-12-22
Alexand
e
r
Kuleshov
c
lean: typ
o
fi
x
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 Haman
o
Sync with
v
2
.
1
.
4
commit
|
commitdiff
|
tree
2014-12-17
Junio C Hama
n
o
Git 2
.
1
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Junio
C
Hamano
Sync with
v2
.
0
.
5
commit
|
commitdiff
|
tree
2014-12-17
Jun
i
o
C
Hamano
Git
2
.
0
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
J
u
n
i
o C Hamano
Sync
w
ith v
1
.
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
J
u
nio C Hamano
Sync
w
i
th v1
.
8
.
5
.
6
commit
|
commitdiff
|
tree
2014-12-17
Ju
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
M
e
r
ge branch 'dot
g
it-case-maint-1
.
8
.
5' into maint-1
.
8
.
5
commit
|
commitdiff
|
tree
2014-12-17
Johannes Sc
h
indelin
fsck: compla
i
n a
b
out
N
TFS "
.
git" aliases
i
n tre
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Joh
a
nnes Sc
h
indelin
re
a
d-cache: o
p
tionally disallow NTFS
.
g
i
t vari
a
nts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
J
ohannes Schindeli
n
path: a
d
d is
_
ntfs_dotgit() hel
p
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
f
sck: com
p
lain about HFS+
"
.
g
i
t"
alia
s
es i
n
t
r
ees
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
read-
c
ache:
o
pti
o
nally disallow HFS+
.
g
i
t variants
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
utf8: add is_
h
fs_dotgit() helper
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff Ki
n
g
fsck: noti
c
e
.
g
i
t case-i
n
sensitivel
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff Ki
n
g
t1450: refactor "
.
",
"
.
.
"
,
and "
.
git" fsck tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
verif
y
_
dotfile(): re
j
ect
.
gi
t
case-insens
i
tively
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
J
eff King
read-tree: add test
s
for
confusing paths l
i
ke
"
.
.
"
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
J
ef
f
King
unpack-trees
:
propagate errors
add
i
ng
entries to
t
he
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-10
Jeff Kin
g
read_packed_refs
:
use
ski
p
_prefix instead of static
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-10
Jeff King
read_packed_
r
efs: pass strbuf to parse_ref_line
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-10
Jeff King
re
a
d_
p
acked_refs:
u
se a strbuf
f
or rea
d
ing lines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-09
Rona
l
d Wamp
l
er
git-am
.
txt: --ign
o
re
-
da
t
e flag is
n
ot
p
a
ssed to git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-05
Junio C H
a
m
ano
Merge branch 'm
a
int' of git://github
.
com/gi
t
-l10n/git
.
.
.
commit
|
commitdiff
|
tree
2014-12-05
J
u
n
io
C
Hamano
St
a
r
t po
s
t
2
.
2 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-05
Jeff King
for
_
each_reflog_ent_rever
s
e: tu
r
n leftover check int
o
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-05
Jeff King
for_each_ref
l
og_ent_reverse: fix newlines on
bl
o
ck
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-01
Jeff
Ki
n
g
push: trul
y
use "simp
l
e" as
default, not "upstream"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-26
Ju
n
io C Hamano
Git 2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-26
Marc Branchaud
RelNotes: spelling & gr
a
mm
a
r tweaks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-26
M
i
ke Hommey
sha1_nam
e
:
avoid
u
nnecessar
y
sh
a
1 lookup
i
n
find_unique_abbrev
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-21
J
unio C Hamano
Git 2
.
2
.
0-r
c
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-21
M
i
c
hael J Gruber
add: ignore only ignored
files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-20
Jeff King
t40
2
6: test "
n
ormal" co
l
or
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-20
Jeff
K
ing
config: f
i
x parsing of "git config
--get-color s
o
me
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-20
J
eff King
docs: describe ANSI 256-
c
olor mo
d
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-19
Junio C Hamano
Merge branch 'sv/
s
ubmitt
i
ng-fina
l
-
p
atch'
commit
|
commitdiff
|
tree
2014-11-19
Junio C Hamano
Merge branch '
s
n
/tutoria
l
-status-output-
e
xampl
e
'
commit
|
commitdiff
|
tree
2014-11-19
Junio
C
H
a
mano
Merge br
a
nch 'mh/d
o
c-remote
-
helper-xref'
commit
|
commitdiff
|
tree
2014-11-19
Junio C Hamano
Merge b
r
a
n
ch '
t
b/no
-
relative-file-
u
rl'
commit
|
commitdiff
|
tree
2014-11-19
Junio
C
H
amano
M
e
rg
e
branch 'cc/inte
r
pr
e
t-
t
railers'
commit
|
commitdiff
|
tree
2014-11-18
Jeff
King
git
w
eb: h
a
ck aro
u
nd
C
G
I
's list-context param() handling
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Jona
t
han Ni
e
der
Makefile
:
ha
v
e python s
c
r
ipts depend
on NO_PYTHON set
t
ing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Jonathan Nieder
Make
f
ile: si
m
p
l
i
f
y
by us
i
ng SCRIPT_{
P
ERL,SH
}
_
G
EN ma
c
ros
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Ju
n
i
o C Hamano
Merg
e
git://github
.
co
m
/git-l
1
0n/g
i
t
-po
commit
|
commitdiff
|
tree
2014-11-18
Junio C
H
ama
n
o
Merge
branch 'jc/doc
-
commit-only'
commit
|
commitdiff
|
tree
2014-11-18
J
u
nio C Hamano
Merge branch 'ta/tuto
r
ial-modernize'
commit
|
commitdiff
|
tree
2014-11-18
Junio
C
H
a
mano
Merge b
r
anch 'da/difftool'
commit
|
commitdiff
|
tree
2014-11-18
Jeff
King
t960[34]: mark cvsim
p
ort tests as
r
e
quirin
g
perl
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Jef
f
King
t0090:
m
ark add
-
int
e
ractiv
e
test with PE
R
L prerequisite
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Jeff King
Ma
k
efile: ha
v
e
p
erl s
c
ripts dep
e
nd on NO_PERL set
t
ing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Mi
c
ha
e
l Ha
g
gerty
c
reate_defau
l
t_files()
:
d
on
'
t
s
et u+x bi
t
on $GIT_D
I
R
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-17
Junio
C
Hamano
M
erge bra
n
ch
'master'
of g
i
t://github
.
com/git-l10
n
.
.
.
commit
|
commitdiff
|
tree
2014-11-17
bria
n
m
.
carlson
Documenta
t
ion: change "gi
t
link" ty
p
o in g
i
t-push
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next