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
t5521: test --dry-run does not make any changes
2015-05-29
Pa
u
l Tan
t55
2
1: test --dry-run does not make any changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520: test --rebase failure on unborn branch w
i
t
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520: test --rebase with multiple branches
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
P
au
l
T
a
n
t5520: test work tree fas
t
-forward when
fetch updates
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
P
a
u
l Tan
t5520: te
s
t
f
o
r
failure if ind
e
x has unresolved entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
t552
0
: test no mer
g
e ca
n
d
i
dat
e
s c
a
ses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul
Tan
t55
2
0
:
prevent field sp
l
itting
i
n
content comparisons
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ham
a
no
merge: deprecate 'gi
t
merge <messa
g
e> HEAD <commit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ham
a
no
m
e
rge: handle FETCH_HEAD
internally
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Haman
o
merg
e
:
decide
if
we
a
u
t
o-generate
t
he message early
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o C Hamano
merge: mak
e
co
l
l
ect_parents() auto-generate the merge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
Hamano
m
erge: ex
t
ract prepare_merge_message() logic out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C Hama
n
o
merge: narrow scope of me
r
g
e_nam
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
m
erge: split reduc
e
_
parents
(
) out of collect_
p
arents
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: clarify collect_par
e
nts() logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: small leakfix
a
nd code s
i
mplificat
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
unio
C Ham
a
no
merge: do not check argc to
det
e
rmin
e
number of re
m
ote
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io C
Hamano
merg
e
:
clarify "pulling into voi
d
"
s
pecial case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C H
a
man
o
t5520: test
p
ulling an octopus i
n
to an
u
nbor
n
branc
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
Hamano
t5520: style fixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o C Hamano
m
erg
e
: simplif
y
c
ode flow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ha
m
ano
merg
e
: test the top
-
l
evel merge driver
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-01-12
J
unio C Hamano
Git 2
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-01-12
Juni
o
C H
a
mano
M
erge branch 'j
k
/read-packed-ref
s
-without-path-m
a
x
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio C Haman
o
M
e
rge br
a
n
c
h 'mg
/
add-ignore-e
r
rors' in
t
o
m
a
int
commit
|
commitdiff
|
tree
2015-01-12
Junio
C Hama
n
o
Mer
g
e branch 'mh/
f
i
nd-
u
niq-abbre
v
' int
o
maint
commit
|
commitdiff
|
tree
2015-01-12
Junio C
H
amano
Merge branch
'
jk/ap
p
roxi
d
ate
-
avoid-y-d-m-over-f
u
t
ure
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Ju
n
io C Ha
m
ano
M
erge
branch 'rw/apply-d
o
es-
n
ot-ta
k
e
-
ig
n
ore-d
a
te' into
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio C
H
amano
Merge branch 'jk/for
-
e
ac
h
-reflo
g
-
ent-reve
r
se'
i
nt
o
.
.
.
commit
|
commitdiff
|
tree
2015-01-07
Junio C
H
a
mano
Merge br
a
nch 'maint-2
.
1
'
into ma
i
nt
commit
|
commitdiff
|
tree
2015-01-07
J
u
n
i
o C Hamano
Mer
g
e branch 'maint-2
.
0' i
n
to maint-2
.
1
commit
|
commitdiff
|
tree
2015-01-07
Jun
i
o C Hamano
Merge bra
n
c
h
'
m
a
i
nt-1
.
9' into
m
aint
-
2
.
0
commit
|
commitdiff
|
tree
2015-01-07
Junio C Hamano
M
e
rge
bra
n
ch '
m
aint-1
.
8
.
5' into maint-1
.
9
commit
|
commitdiff
|
tree
2015-01-07
Juni
o
C
Hamano
Merge bra
n
ch 'jk/dotgit-case-maint-1
.
8
.
5' into maint
.
.
.
commit
|
commitdiff
|
tree
2014-12-29
Je
f
f King
is_hfs_dotgit: loos
e
n over-eager matc
h
of
\
u{
.
.
47}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
P
repare for 2
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-22
Junio C H
a
mano
Merge br
a
n
ch 'jk/rebuild-perl-scr
i
pts-w
i
th-no-p
e
rl
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Junio
C Hamano
M
e
rge
b
ranch 'jk/no-perl
-
tests
'
into maint
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Mer
g
e
b
r
a
n
ch 'po/everyda
y
-doc' into mai
n
t
commit
|
commitdiff
|
tree
2014-12-22
Ju
n
io C Hama
n
o
Me
r
ge branch 'jk/push-sim
p
l
e' into maint
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Me
r
ge branch 'mh/config-flip-xbit-
b
a
ck-after-c
h
eck
i
ng
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
J
u
nio C Ham
a
no
Merge branch
'
j
k
/
gitweb-
w
ith-newer-c
g
i
-m
u
l
t
i-param
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
J
unio
C
Hama
n
o
M
e
rge bra
n
ch 'rs
/
rece
i
ve-p
a
ck-use-labs' into maint
commit
|
commitdiff
|
tree
2014-12-22
J
unio C Hamano
M
erge bran
c
h 'rs/mai
n
t-con
f
ig-use
-
l
a
bs' in
t
o maint
commit
|
commitdiff
|
tree
2014-12-22
J
u
nio
C Hamano
M
erge br
a
nch 'js
/
windows-open-ei
s
d
i
r
-
error'
int
o
main
t
commit
|
commitdiff
|
tree
2014-12-22
Ju
n
io
C
Hamano
M
e
r
g
e branch '
j
k/colors-fix' into
m
aint
commit
|
commitdiff
|
tree
2014-12-22
Junio
C
Hamano
M
e
rge branch
'jk
/
checkout-from
-
t
r
ee' into maint
commit
|
commitdiff
|
tree
2014-12-22
Alexande
r
Kul
e
s
hov
clean: typofi
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
J
u
nio C
H
amano
Git 2
.
2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jun
i
o C Hamano
S
y
n
c
with v2
.
1
.
4
commit
|
commitdiff
|
tree
2014-12-17
Junio
C Ham
a
no
Git
2
.
1
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
J
u
nio C Hamano
Sync with v2
.
0
.
5
commit
|
commitdiff
|
tree
2014-12-17
Junio C
H
a
mano
Git
2
.
0
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Junio C Hamano
S
ync
with v1
.
9
.
5
commit
|
commitdiff
|
tree
2014-12-17
Junio C Haman
o
Git 1
.
9
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Junio C Ha
m
ano
Syn
c
with v1
.
8
.
5
.
6
commit
|
commitdiff
|
tree
2014-12-17
Junio C
H
amano
Git 1
.
8
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
J
u
nio
C H
a
mano
M
erge branc
h
'dotgit-
c
ase-maint-1
.
8
.
5' into
main
t
-1
.
8
.
5
commit
|
commitdiff
|
tree
2014-12-17
Johannes
S
chi
n
delin
fsck: complain about NTF
S
"
.
gi
t
"
a
l
i
a
s
es in tre
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
J
o
hannes Schinde
l
i
n
r
e
ad-cache: optiona
l
ly d
i
sa
l
l
ow NTFS
.
git v
a
r
i
ants
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Johanne
s
Schindelin
p
ath: a
d
d
is_ntfs_dotgit() helper
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jeff
K
ing
fsck: c
o
m
p
lain
a
bout HFS
+
"
.
g
it
"
aliases i
n
trees
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
r
e
ad
-
cache: optiona
l
ly disallow H
F
S
+
.
git variants
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
J
e
f
f King
utf8: add is_h
f
s_d
o
tgit() hel
p
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jeff Kin
g
fsck:
notice
.
git case-i
n
sensitively
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jeff
K
ing
t1450: refact
o
r
"
.
"
, "
.
.
", and "
.
git" fsck
tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
J
e
ff
K
ing
verify_dotf
i
le(): reject
.
g
i
t case-i
n
sensitively
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
J
e
ff King
read
-
tree: add tests for
c
onfusing paths like "
.
.
"
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jeff
King
unpac
k
-trees: propagate
e
rrors adding
e
ntries t
o
t
he
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-10
Jeff Kin
g
r
e
ad_p
a
cked_refs: us
e
skip_p
r
efix instea
d
of static
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-10
J
eff
King
read_pac
k
ed_r
e
fs: pa
s
s strbuf
t
o
p
arse_ref_line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-10
Je
f
f King
read_packed_ref
s
: use a strbuf
f
or r
e
ading lines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-09
Ro
n
ald
W
a
mpler
g
it-am
.
txt: --ign
o
re
-
date
flag is not passed to git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-05
Junio C Hamano
Merge branch 'maint'
o
f gi
t
://gi
t
hub
.
co
m
/
g
it-l10n/
g
it
.
.
.
commit
|
commitdiff
|
tree
2014-12-05
Jun
i
o C Hamano
St
a
rt
p
ost 2
.
2
cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-05
Jeff
K
ing
for_each_
r
eflog_ent_reve
r
se: turn leftover
c
he
c
k into
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-05
Jeff King
f
o
r_ea
c
h_reflog
_
ent_reverse: fix n
e
wlines
o
n
block
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-01
Jef
f
King
p
u
s
h
:
t
r
u
ly use "simple" a
s
def
a
ult, not "upstr
e
am"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-26
Junio C Hamano
Git 2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-26
Ma
r
c Branchaud
Re
l
Notes: spelling & grammar tweak
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-26
Mike Homm
e
y
sh
a
1_nam
e
: av
o
id
u
n
necessar
y
s
ha1 lookup
i
n fi
n
d_un
i
que_abbrev
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-21
J
u
nio C Hamano
Git 2
.
2
.
0-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-21
M
i
c
h
ael
J Gruber
a
dd: ignore o
n
ly i
g
nored files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-20
Jeff King
t4026: tes
t
"normal" color
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-20
Jeff King
con
f
ig: fix parsing
of "git config --get-color
s
om
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-20
Jeff King
do
c
s: describe ANSI 256-color mod
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-19
Junio C
H
amano
Merge branc
h
'sv/
s
u
b
mitt
i
ng-final-patch'
commit
|
commitdiff
|
tree
2014-11-19
Junio C Hamano
Me
r
ge branch 'sn/tutoria
l
-status-output-example'
commit
|
commitdiff
|
tree
2014-11-19
Junio C Hamano
Merge bra
n
c
h 'mh
/
do
c
-
r
emo
t
e-helper-xref'
commit
|
commitdiff
|
tree
2014-11-19
Junio
C
Hamano
Merge b
r
anch 'tb/no-rela
t
ive-
f
ile-url'
commit
|
commitdiff
|
tree
2014-11-19
Junio C Hamano
M
e
r
g
e branch
'cc/in
t
erpret-trailers'
commit
|
commitdiff
|
tree
2014-11-18
Jeff
King
gitweb: hack around CGI'
s
list-context para
m
() h
a
ndli
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-18
J
o
nathan Nie
d
er
Makefil
e
: have
p
yt
h
o
n
scripts depend on
NO_PYTHON sett
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-18
Jonathan Nieder
Mak
e
file:
simp
l
i
f
y by usi
n
g
SCRIPT_{PERL,SH}_GEN macros
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-18
Junio C H
a
mano
M
erge git:/
/
g
i
t
hub
.
com/
g
i
t
-l10n/git
-
po
commit
|
commitdiff
|
tree
2014-11-18
Junio C H
a
man
o
Me
r
ge br
a
nch 'jc/doc-commit-o
n
l
y'
commit
|
commitdiff
|
tree
2014-11-18
Junio C Hamano
M
erge b
r
anch 'ta/tutorial-modernize'
commit
|
commitdiff
|
tree
2014-11-18
Junio C H
a
mano
M
e
rge branch
'da/dif
f
tool'
commit
|
commitdiff
|
tree
2014-11-18
Jeff King
t
960[3
4
]:
mark
cvsimport tests as requ
i
r
i
ng
perl
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-18
Jeff
Kin
g
t009
0
: mark add-intera
c
tive tes
t
with PERL pr
e
requisite
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next