repo.or.cz
/
git
/
gitweb.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
2
0: chec
k
reflog ac
t
i
o
n in
f
ast-forward merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5521: test --dry-run does no
t
m
a
ke any c
h
ang
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t552
0
: test --rebas
e
f
ail
u
re on
u
n
b
o
r
n
b
ranch
with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t
5520:
te
s
t
-
-r
e
base with mu
l
tiple branche
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Ta
n
t552
0
: test
work
t
ree fast-forward when fetch u
p
dates
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul
Tan
t5520:
t
e
st for failure
i
f in
d
ex has unresolved entri
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
t
5
520
:
t
e
st no mer
g
e cand
i
dates cases
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
t5520: prevent field s
p
l
i
tting in
content c
o
mpa
r
isons
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
u
ni
o
C
Hamano
me
r
ge: depreca
t
e 'git merge <m
e
ssage> HEAD <commit
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io C
H
amano
merge: h
a
ndle FETCH_HEAD
i
nter
n
all
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: decid
e
i
f
we auto-g
e
nerate th
e
m
essage ear
l
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o C H
a
mano
m
e
rge: make coll
e
ct_par
e
nts() auto
-
gene
r
a
te the merg
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C Hamano
merge: ext
r
act prepa
r
e_
m
erge_message
(
) logi
c
ou
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
mer
g
e:
narrow
scope of m
e
rge_names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
m
e
rge: split
r
educe_parents()
out of collect_parents()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ha
m
ano
m
erge: clarify collect_p
a
r
e
nts() logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
amano
merg
e
: sma
l
l leakfix and code simplif
i
cation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: do not check
a
rgc to determine number of remote
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ha
m
ano
mer
g
e:
clar
i
fy
"pullin
g
int
o
void" speci
a
l
ca
s
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Hamano
t5520:
t
est pulling
a
n octopus into an un
b
o
r
n b
r
anc
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ham
a
no
t552
0
: style fixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio C Ham
a
n
o
mer
g
e: simplify
code flow
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
ama
n
o
merge
:
test th
e
top-level merge dr
i
ver
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-01-12
Juni
o
C Hamano
Git 2
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-01-12
Jun
i
o C H
a
mano
Mer
g
e b
r
anch
'
jk/read-pack
e
d-refs-with
o
ut-path-m
a
x
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio
C Hamano
Mer
g
e branch 'mg/add-ignore-erro
r
s
'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2015-01-12
Jun
i
o
C
Hamano
Me
r
g
e branch 'mh/fin
d
-
u
niq-abb
r
ev'
in
t
o mai
n
t
commit
|
commitdiff
|
tree
2015-01-12
Junio C Ham
a
no
Merge branch
'
jk/
a
p
pr
o
xida
t
e-a
v
oid-y-d-m
-
over-fu
t
ure
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio
C
Hamano
Me
r
ge b
r
anch '
r
w/appl
y
-does-not-take-ignore-date'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio C Hama
n
o
Merge branch 'jk/f
o
r-each-reflo
g
-ent
-
reverse' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2015-01-07
Junio C Ha
m
ano
Merge branch 'maint-2
.
1' into mai
n
t
commit
|
commitdiff
|
tree
2015-01-07
Juni
o
C Haman
o
M
erge bra
n
ch 'maint-2
.
0' into main
t
-2
.
1
commit
|
commitdiff
|
tree
2015-01-07
Junio C
H
am
a
n
o
Merge branch 'maint-1
.
9
' into maint-2
.
0
commit
|
commitdiff
|
tree
2015-01-07
Juni
o
C Hamano
Merge bran
c
h
'maint-1
.
8
.
5' into maint-1
.
9
commit
|
commitdiff
|
tree
2015-01-07
J
u
nio C Hamano
Mer
g
e br
a
nch 'jk/dotgit-case-
m
aint-1
.
8
.
5' into ma
i
nt
.
.
.
commit
|
commitdiff
|
tree
2014-12-29
Jeff King
is
_
hfs_dotgit:
l
oosen over-eager
m
a
t
ch of
\u{
.
.
47
}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Prepare fo
r
2
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Merge branch 'jk/rebuil
d
-pe
r
l-scripts-with-no
-
p
e
rl
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
J
uni
o
C Hamano
Merge branch 'jk/no-p
e
rl-tests' i
n
to
m
aint
commit
|
commitdiff
|
tree
2014-12-22
Junio C Ham
a
no
Merge br
a
n
ch 'po/everyday-doc' into maint
commit
|
commitdiff
|
tree
2014-12-22
Junio
C Ham
a
no
Merge
b
r
anch 'jk/p
u
sh-sim
p
l
e
' into maint
commit
|
commitdiff
|
tree
2014-12-22
Jun
i
o C Hamano
Merge branch 'mh/con
f
ig
-
flip-xbi
t
-back
-
after-chec
k
ing
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Merge
b
ranch 'jk
/
gitweb-wit
h
-newer-cgi-multi-param
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
J
unio C Hamano
Merge bra
n
ch 'r
s
/receive-pack-use
-
labs' into main
t
commit
|
commitdiff
|
tree
2014-12-22
Ju
n
io C Ha
m
ano
Me
r
ge branc
h
'rs/ma
i
n
t-conf
i
g-use
-
labs' into
m
a
int
commit
|
commitdiff
|
tree
2014-12-22
Jun
i
o C Hama
n
o
Merge b
r
anch 'js/windows-open-eis
d
ir-error' into mai
n
t
commit
|
commitdiff
|
tree
2014-12-22
Junio C Ha
m
a
n
o
Merg
e
b
ranch 'jk/colors-fix' into
ma
i
nt
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Merge branch 'jk/
c
heckou
t
-from-t
r
ee' into maint
commit
|
commitdiff
|
tree
2014-12-22
Alexander Kuleshov
clean: typ
o
fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jun
i
o
C
Ham
a
no
Git 2
.
2
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Junio C Hamano
Sync 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
Junio C Hama
n
o
Sync with 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
Jun
i
o
C
Hamano
Sync with v1
.
9
.
5
commit
|
commitdiff
|
tree
2014-12-17
Junio C Hamano
G
it 1
.
9
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
J
unio C
H
amano
Sync with
v1
.
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
Ju
n
io C Hamano
M
e
rge branch
'
dotgit-cas
e
-maint-1
.
8
.
5' in
t
o ma
i
nt-1
.
8
.
5
commit
|
commitdiff
|
tree
2014-12-17
J
o
hannes
S
c
hindelin
fsck:
c
omplai
n
abo
u
t NT
F
S "
.
g
it
"
a
l
iases in trees
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Johanne
s
Schindelin
re
a
d
-
cache: o
p
tionally disallow NTFS
.
git variants
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
J
ohannes Schindelin
path: add is_
n
tfs_dotgi
t
() he
l
p
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
J
e
ff King
fsck: complain about
HFS+ "
.
git" ali
a
ses in trees
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
J
e
ff King
r
e
ad-cache: optio
n
al
l
y
d
isall
o
w HFS+
.
git vari
a
nt
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff K
i
ng
utf8: add is
_
hfs_dotgit() hel
p
er
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff Kin
g
f
s
ck: notice
.
git case-inse
n
sitivel
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
J
e
ff King
t1450: refac
t
or "
.
", "
.
.
",
and "
.
git" fsck tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Je
f
f King
v
erify_
d
o
t
file()
:
rej
e
ct
.
g
i
t case
-
insensitively
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff
K
i
n
g
read-t
r
ee: a
d
d
t
e
s
ts f
o
r confu
s
i
n
g paths like "
.
.
"
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
unpack-trees
:
propa
g
a
t
e
e
rror
s
adding
e
n
t
ries to
t
he
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-10
Jeff Kin
g
read_pack
e
d_refs: u
s
e
skip_prefix instead of
s
t
a
t
ic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-10
J
e
ff
King
read_packed_
r
ef
s
:
pa
s
s
strbuf to parse
_
r
e
f_line
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-10
Jeff King
read_
p
acked_r
e
fs: use a st
r
buf for rea
d
ing lines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-09
Rona
l
d
W
am
p
ler
gi
t
-am
.
tx
t
: --ignore-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
M
erge branch '
m
a
int' of git://github
.
com/git-l1
0
n/git
.
.
.
commit
|
commitdiff
|
tree
2014-12-05
Junio C Ham
a
no
Start p
o
st 2
.
2 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-05
Jeff King
fo
r
_each_reflog_e
n
t_reverse: t
u
rn leftover check
i
nto
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-05
Jeff King
for_each_reflog_ent_reverse: fix
newlines on block
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-12-01
Jeff
K
i
n
g
push: t
r
uly
use "
s
imple" as
defaul
t
,
not "ups
t
ream
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-26
Junio
C
Ham
a
no
Git 2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-26
Marc Branch
a
ud
RelNo
t
es: spelling & g
r
amm
a
r
t
w
eaks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-26
Mike Homme
y
sha1_n
a
me: av
o
id unne
c
essary
s
h
a1 lookup
i
n find_unique_abbr
e
v
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-21
J
unio
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
hael J Gruber
add: ignore only ignor
e
d
files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-20
Jeff King
t4026: test "no
r
ma
l
" color
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-20
Jeff King
config: fix parsi
n
g of "
g
i
t co
n
fig
--
g
et
-
co
l
or some
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-20
Jeff King
docs: de
s
c
r
ib
e
ANSI 256-color mode
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-19
Junio
C Hamano
Merge branch 's
v
/submittin
g
-final-patch'
commit
|
commitdiff
|
tree
2014-11-19
Junio
C Hamano
M
erge
b
r
anc
h
'
sn/tut
o
rial-statu
s
-out
p
ut-ex
a
mple'
commit
|
commitdiff
|
tree
2014-11-19
Junio C Hamano
M
erge branc
h
'mh/doc-rem
o
te-h
e
lper-xref'
commit
|
commitdiff
|
tree
2014-11-19
Junio
C Hamano
Mer
g
e bran
c
h
'
tb/no-r
e
lative-file-url'
commit
|
commitdiff
|
tree
2014-11-19
Junio C Hamano
Merge
b
r
anch 'cc/interp
r
et-trailers
'
commit
|
commitdiff
|
tree
2014-11-18
Jeff King
gitwe
b
: hack around CGI's list-context param() handling
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Jonathan Nieder
Ma
k
ef
i
le
:
have python scripts de
p
end on NO_
P
YTHON setting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
Jonathan
N
ieder
Makefile:
s
impl
i
f
y
b
y
using SCRIPT_{PE
R
L,SH}_GEN m
a
c
r
os
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-11-18
J
u
nio C Hamano
Mer
g
e
git://gith
u
b
.
com/gi
t
-
l
10n/git-po
commit
|
commitdiff
|
tree
2014-11-18
J
unio C Hama
n
o
Merge
branch 'jc/doc-
c
ommit
-
only'
commit
|
commitdiff
|
tree
2014-11-18
Junio C Hamano
M
e
r
ge br
a
nch 'ta/tutoria
l
-modernize
'
commit
|
commitdiff
|
tree
2014-11-18
Junio
C
Ha
m
ano
Merge branch 'da/difftool'
commit
|
commitdiff
|
tree
2014-11-18
J
eff Ki
n
g
t960[34]: mark cvsi
m
p
ort tests
as requir
i
ng perl
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next