repo.or.cz
/
git.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
Paul Tan
t55
2
0: t
e
st --reb
a
se
f
ailure
o
n u
n
born
b
r
a
nch wi
t
h
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520: te
s
t --r
e
base with mul
t
i
p
le bran
c
hes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520
:
test w
o
rk tr
e
e f
a
st-
f
o
r
war
d
w
hen fet
c
h up
d
ates
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520: tes
t
for failu
r
e if index has u
n
resol
v
ed en
t
ries
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-18
Paul
T
an
t
5
5
2
0: test no merge
c
a
n
d
i
date
s
cases
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
t5520: prevent fi
e
ld splitting i
n
content compar
i
sons
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio C Hamano
merge
:
deprecate 'git merge <message> HEAD <
c
ommi
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hama
n
o
merge
:
handle
FETCH_HEAD int
e
rn
a
lly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
H
a
mano
m
erge: decide i
f
we a
u
to-generate th
e
messag
e
early
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: make collect_par
e
nts() auto-gen
e
rat
e
the merge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ham
a
no
merge: extract p
r
epare_me
r
ge_message() l
o
gic ou
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o C Hamano
merge: nar
r
o
w
scop
e
of merge_
n
ames
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio
C Hamano
m
erge: split reduce_parent
s
() out of collect_parents()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: clarify collect_parents() l
o
gi
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: s
m
al
l
leakf
i
x
and code simplif
i
cati
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C
Hama
n
o
merge:
d
o
n
ot
chec
k
argc to determine nu
m
b
e
r
o
f remote
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Haman
o
m
erge:
clarify
"pulling i
n
t
o
voi
d
" sp
e
cial c
a
s
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
un
i
o C Hamano
t5520: test pulling an
o
ctopus in
t
o an unborn
branch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
H
a
mano
t5520: st
y
l
e
f
ixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
aman
o
me
r
ge: si
m
p
lify cod
e
fl
o
w
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
unio
C Ha
m
ano
me
r
ge: test the t
o
p-le
v
e
l
m
er
g
e
drive
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-01-12
Junio C
H
amano
Git 2
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-01-12
J
u
nio C Hamano
Merge b
r
anch 'jk/read-pack
e
d
-
refs-with
o
u
t
-
p
ath-max
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio
C
H
aman
o
Merge
b
ranch '
m
g/ad
d
-ignore
-
errors' i
n
t
o ma
i
nt
commit
|
commitdiff
|
tree
2015-01-12
Junio C Hamano
Merge branc
h
'mh/find-uniq-a
b
b
r
ev' in
t
o maint
commit
|
commitdiff
|
tree
2015-01-12
Junio
C
Ham
a
no
Merge br
a
nch 'j
k
/appr
o
xidate-avoid-y-d-m-over-future
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio C H
a
mano
Merge bran
c
h
'rw/
a
ppl
y
-does-not-take-i
g
n
ore-date' into
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio C Hamano
Merge branc
h
'
j
k/for-ea
c
h-reflog-ent-reverse' into
.
.
.
commit
|
commitdiff
|
tree
2015-01-07
Jun
i
o
C Ha
m
ano
Merge bra
n
ch '
m
aint
-
2
.
1' into maint
commit
|
commitdiff
|
tree
2015-01-07
J
u
n
io C Hamano
Merge
b
r
a
n
ch 'maint-2
.
0' into ma
i
nt-2
.
1
commit
|
commitdiff
|
tree
2015-01-07
Junio
C Ham
a
no
M
e
rge branch 'mai
n
t-1
.
9' into
m
aint-2
.
0
commit
|
commitdiff
|
tree
2015-01-07
J
u
nio C Hamano
Merge
b
ranch 'maint-
1
.
8
.
5' in
t
o maint-1
.
9
commit
|
commitdiff
|
tree
2015-01-07
Junio C
H
amano
Me
r
ge branc
h
'
jk/dotgit-case-maint-
1
.
8
.
5
' int
o
maint
.
.
.
commit
|
commitdiff
|
tree
2014-12-29
Jeff King
i
s
_
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
nio
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
Junio C Hamano
M
e
rge branch 'jk/rebuild-pe
r
l-sc
r
i
p
t
s
-with-no-perl
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Merge b
r
a
n
ch 'j
k
/
no-perl-test
s
' into maint
commit
|
commitdiff
|
tree
2014-12-22
J
u
nio C
Ham
a
no
M
er
g
e branch 'po
/
eve
r
yda
y
-
doc' in
t
o
m
aint
commit
|
commitdiff
|
tree
2014-12-22
Junio
C Hamano
Merge branch
'
jk/push-
s
imple
'
into
main
t
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Merge branch 'mh/config-fl
i
p-xbit-back-a
f
ter-c
h
ecking
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Jun
i
o
C
H
a
mano
Mer
g
e bran
c
h '
j
k/gitweb-w
i
th
-
newe
r
-cgi-multi-param
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Merge branch 'rs/receive
-
pack-
u
se-labs'
into
m
ai
n
t
commit
|
commitdiff
|
tree
2014-12-22
Junio C Ham
a
no
Merge branch 'rs/main
t
-config-
u
se-labs' i
n
t
o
ma
i
nt
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Me
r
ge branch 'js/
w
indows
-
open-ei
s
di
r
-
error' int
o
mai
n
t
commit
|
commitdiff
|
tree
2014-12-22
Jun
i
o C Hamano
Me
r
ge branch 'jk/col
o
rs-fix' into mai
n
t
commit
|
commitdiff
|
tree
2014-12-22
Junio C H
a
m
ano
Merg
e
branch 'jk/che
c
k
out-from-
t
ree' into maint
commit
|
commitdiff
|
tree
2014-12-22
Alexander K
u
l
es
h
ov
clean: typofix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jun
i
o C Hamano
Git 2
.
2
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Ju
n
io C
Hamano
Sync with
v
2
.
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 Hamano
Sync
w
ith
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
J
u
n
io C
H
amano
S
yn
c
with v1
.
9
.
5
commit
|
commitdiff
|
tree
2014-12-17
Juni
o
C Hamano
G
i
t 1
.
9
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Junio
C H
a
man
o
Sync
with v1
.
8
.
5
.
6
commit
|
commitdiff
|
tree
2014-12-17
Junio
C Ham
a
no
Git
1
.
8
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Junio C Hama
n
o
Merge
b
ranch 'dotgit-case-maint-1
.
8
.
5' into maint-1
.
8
.
5
commit
|
commitdiff
|
tree
2014-12-17
Johannes Schindelin
fsck
:
complain about
N
T
F
S
"
.
git" ali
a
ses in trees
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
J
o
hannes Schi
n
delin
read-cache: optionally
disallow NTFS
.
git varia
n
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Johannes Schinde
l
i
n
path:
a
dd is_n
t
fs_dotgit() helper
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
fsck:
c
o
mplain
a
bout
HF
S
+ "
.
g
i
t
" aliases in trees
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
read-cache: opti
o
nally d
i
sallow
HFS+
.
git varia
n
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff
K
ing
u
tf8: add
i
s
_
h
fs_dotgit(
)
helper
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Je
f
f King
fsck:
n
otice
.
g
i
t case-
i
nsensitively
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
t1
4
50: refactor "
.
", "
.
.
",
a
nd "
.
git" fsck t
e
sts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jef
f
K
i
ng
verify
_
do
t
file(): reject
.
git ca
s
e-insensitively
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
J
eff Kin
g
read-tree: add tes
t
s for confusing
p
aths like
"
.
.
"
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
unp
a
c
k-trees: propag
a
te er
r
ors adding
e
nt
r
ies t
o
t
he
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-10
J
eff K
i
ng
r
e
ad_pa
c
ked_refs: use skip_
p
re
f
ix instead of
static
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-10
J
eff Kin
g
read_pack
e
d_refs: pass s
t
rbuf to parse_ref_lin
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-10
Jeff
King
read_pack
e
d_refs
:
use a str
b
uf for
r
eading lines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-09
Ronald Wamp
l
er
g
i
t
-am
.
txt: --ignore-date flag is not passe
d
to git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-05
Jun
i
o
C
Hamano
Merge br
a
n
c
h 'maint'
o
f
gi
t
://g
i
th
u
b
.
com/git-l
1
0n/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 Kin
g
for_each_ref
l
og_e
n
t_reverse: turn
l
eftover chec
k
into
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-05
Jef
f
King
for_each_reflog_ent_
r
everse: fix ne
w
lines on block
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-01
Jeff
King
push: truly use "simple" as default, not "up
s
t
r
eam"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-26
Junio
C Hamano
G
i
t
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-26
M
arc Bra
n
chaud
RelNote
s
: sp
e
ll
i
ng &
g
rammar t
w
eaks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-26
Mike Homm
e
y
sha1_
n
a
m
e: a
v
oid
u
nne
c
essary sha1 lookup in
f
i
n
d
_unique_a
b
brev
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-21
Junio C Haman
o
Git 2
.
2
.
0-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-21
Mic
h
ael
J Gruber
add: ignore only i
g
no
r
ed
f
i
l
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-20
Jef
f
King
t4026:
t
est "normal" color
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-20
Je
f
f King
c
onfig: fix parsing o
f
"git
c
o
nfig --get-
c
olor some
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-20
Jeff Kin
g
d
ocs: descr
i
be ANSI 2
5
6-color mode
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-19
Junio
C
H
a
mano
M
e
rg
e
branch 'sv/sub
m
it
t
ing-final-pat
c
h'
commit
|
commitdiff
|
tree
2014-11-19
Junio C Ham
a
no
Merg
e
bran
c
h 'sn/
t
utor
i
al-
s
tatus-output-example'
commit
|
commitdiff
|
tree
2014-11-19
Junio
C
H
amano
Merge branch 'mh/doc-r
e
mo
t
e-helper-xref'
commit
|
commitdiff
|
tree
2014-11-19
Junio C Hamano
M
e
rg
e
branch 'tb/no
-
relative-file-u
r
l'
commit
|
commitdiff
|
tree
2014-11-19
Junio C Hama
n
o
Merge branc
h
'c
c
/interpret-trailers'
commit
|
commitdiff
|
tree
2014-11-18
Jeff Ki
n
g
g
itweb:
h
ack around CGI's list-context par
a
m
()
h
andling
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
J
o
nathan Nieder
Mak
e
fi
l
e: h
a
ve python s
c
ripts depend
o
n NO_PYTHON setting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Jo
n
athan
N
ieder
Makefile:
simpl
i
fy by using
SCRIPT_{PERL
,
SH}_GEN macr
o
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Junio C Hamano
M
e
rge g
i
t://gi
t
hu
b
.
com/g
i
t-l10n/g
i
t-po
commit
|
commitdiff
|
tree
2014-11-18
J
unio
C H
a
mano
Mer
g
e
b
ranc
h
'
jc/doc-commit-only'
commit
|
commitdiff
|
tree
2014-11-18
Junio C Hamano
Mer
g
e
b
r
anch 'ta/tutorial-modernize'
commit
|
commitdiff
|
tree
2014-11-18
Junio
C H
a
mano
Merge branch 'da/difftool'
commit
|
commitdiff
|
tree
2014-11-18
J
eff King
t960[34]
:
mark
c
vs
i
mport tests as requiring
perl
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Jeff King
t0
0
90: ma
r
k add-interact
i
ve tes
t
with PERL
p
rerequisite
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Jeff K
i
ng
M
a
kefile: have perl s
c
ript
s
depe
n
d on
N
O_PER
L
s
etting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next