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 --rebase failure on unborn branch with index
2015-05-29
Paul Tan
t5
5
20: te
s
t
--rebase f
a
ilure on unborn
b
ranch
with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520: te
s
t --rebase
w
i
th multiple branches
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Pa
u
l Ta
n
t55
2
0:
t
est work tree fast-forward wh
e
n fetch
u
p
d
ates
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-29
Paul
Tan
t
5520: test for failure i
f
index has un
r
e
s
ol
v
e
d entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-18
P
au
l
Tan
t552
0
: test
no merge can
d
idates cases
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
t
5520:
p
re
v
e
nt
f
ield splitt
i
ng in cont
e
n
t compari
s
ons
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
unio C
H
a
mano
mer
g
e:
dep
r
eca
t
e 'git merge <message> HEAD <commit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: handle FETCH
_
HEAD inte
r
n
all
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Hamano
m
e
rge: decide
i
f
we auto-gene
r
ate the
message early
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
Ha
m
ano
merge: m
a
k
e
c
ollec
t
_parents() auto-generate
the merge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
a
m
ano
me
r
ge: extract p
r
ep
a
re_me
r
ge_m
e
ssage
(
) logic out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
unio C
Ham
a
n
o
merge: narr
o
w scop
e
of merg
e
_na
m
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio C Hamano
merge: spl
i
t reduce_pare
n
ts() out of c
o
llect_
p
arents()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merg
e
: clarify
collect_paren
t
s
()
l
o
gic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
ama
n
o
merge: smal
l
lea
k
fix and
code simpl
i
fication
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
Ha
m
ano
merg
e
: do
n
ot check arg
c
to
determ
i
ne number of r
e
mote
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o C H
a
mano
me
r
ge: clarify "pullin
g
i
n
to void" special case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C Ha
m
ano
t5520:
t
e
st pulling an
octopus into a
n
unborn branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
n
io C Hamano
t5
5
20: sty
l
e fixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
aman
o
merge: simplify code flow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: test the top-level merge dr
i
v
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-01-12
Junio C H
a
man
o
G
i
t 2
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-01-12
Junio C Hamano
Merge br
a
nch 'jk/read-
p
a
c
ked-refs-
w
it
h
out-p
a
t
h-max
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio C Hamano
Merge branch 'mg/add
-
ignore-errors' into maint
commit
|
commitdiff
|
tree
2015-01-12
Juni
o
C Haman
o
Merge b
r
anch 'mh/find-uniq-abbrev
'
into m
a
i
nt
commit
|
commitdiff
|
tree
2015-01-12
Junio C Hamano
M
e
rge bran
c
h
'
jk/approxi
d
ate-avoid-y
-
d-m-over-fu
t
u
r
e
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Junio C Hamano
Merge branch 'rw/apply-does-
n
o
t
-take
-
ig
n
or
e
-
d
ate' into
.
.
.
commit
|
commitdiff
|
tree
2015-01-12
Juni
o
C Ham
a
no
Merge branch 'jk/
f
or-each-reflog-ent-rever
s
e' into
.
.
.
commit
|
commitdiff
|
tree
2015-01-07
J
unio C Hamano
Merge br
a
nch 'm
a
int
-
2
.
1'
int
o
maint
commit
|
commitdiff
|
tree
2015-01-07
Junio C
Hamano
Me
r
ge branch 'maint-
2
.
0'
i
nto m
a
int-2
.
1
commit
|
commitdiff
|
tree
2015-01-07
Junio C Ham
a
no
Merge branch 'maint-1
.
9'
into
m
aint-2
.
0
commit
|
commitdiff
|
tree
2015-01-07
Junio C Haman
o
Merge bra
n
ch 'main
t
-1
.
8
.
5
' into main
t
-1
.
9
commit
|
commitdiff
|
tree
2015-01-07
Junio C Ha
m
ano
M
e
r
g
e branch 'jk/do
t
gi
t
-case-
m
a
int-1
.
8
.
5' into maint
.
.
.
commit
|
commitdiff
|
tree
2014-12-29
Jeff Ki
n
g
is_hfs_do
t
git: loo
s
e
n
over-eag
e
r
match of \u{
.
.
47}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
P
r
epa
r
e for
2
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
M
erge br
a
nch 'jk/re
b
uild-perl-sc
r
ipts-w
i
th-no-p
e
rl
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
J
unio C H
a
mano
Merge
b
ranc
h
'jk/no-p
e
rl-t
e
s
ts' into maint
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Merge branch 'po
/
everyday-do
c
'
int
o
m
a
int
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Merg
e
branch 'j
k
/push-simple' into maint
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Merge branc
h
'mh
/
co
n
fig-flip-xbit-back
-
after-chec
k
in
g
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Ju
n
i
o
C
Hama
n
o
Merge branch 'jk/git
w
eb
-
with-newe
r
-cgi-multi-pa
r
am
.
.
.
commit
|
commitdiff
|
tree
2014-12-22
Junio C
H
a
m
ano
Merge branch 'rs/receive-pack-use-labs' into maint
commit
|
commitdiff
|
tree
2014-12-22
J
unio C Hamano
Me
r
ge branch '
r
s/
m
a
i
nt-config-us
e
-l
a
bs' into maint
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Merge b
r
anch 'js/win
d
ows-open-eisdir-error' into
maint
commit
|
commitdiff
|
tree
2014-12-22
Junio C Hamano
Merge branch '
j
k/colors
-
f
ix' into ma
i
nt
commit
|
commitdiff
|
tree
2014-12-22
Juni
o
C Hamano
Merge branch '
j
k/chec
k
out-from-tree' into maint
commit
|
commitdiff
|
tree
2014-12-22
Al
e
xander Kuleshov
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
Junio C Haman
o
Sync
w
ith v2
.
1
.
4
commit
|
commitdiff
|
tree
2014-12-17
Junio
C
Haman
o
G
i
t 2
.
1
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Juni
o
C Hamano
Sy
n
c with
v2
.
0
.
5
commit
|
commitdiff
|
tree
2014-12-17
Junio C Ha
m
ano
Gi
t
2
.
0
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jun
i
o C
Hamano
Syn
c
with v1
.
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
Junio C Hamano
Sync wit
h
v1
.
8
.
5
.
6
commit
|
commitdiff
|
tree
2014-12-17
Junio
C H
a
mano
G
i
t 1
.
8
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
J
unio C
Hamano
Merge
bra
n
c
h
'dotgit-case-maint-1
.
8
.
5
' i
n
to ma
i
nt-1
.
8
.
5
commit
|
commitdiff
|
tree
2014-12-17
Joh
a
nnes Schindelin
f
s
ck:
c
omplain abo
u
t NTFS
"
.
git" aliases in trees
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Johannes S
c
h
ind
e
lin
read-cache: opt
i
onall
y
disallow
NTFS
.
git varia
n
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
J
o
han
n
es Schindelin
path
:
add is_nt
f
s_dotgit() helper
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
J
e
ff
K
ing
fsc
k
: complain abo
u
t HFS+ "
.
git
"
ali
a
ses in trees
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
r
e
ad
-
c
a
c
h
e: o
p
tionall
y
disallo
w
H
F
S+
.
git variants
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
utf8: add i
s
_hfs
_
dotgit() helper
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
f
s
ck: notice
.
git case-insensitively
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jeff
King
t1450: refactor "
.
", "
.
.
", and "
.
git" fsck tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jeff Ki
n
g
verify_dot
f
ile(): reject
.
git case-inse
n
sitively
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Je
f
f
King
read-tree: add t
e
s
ts f
o
r
c
on
f
u
s
ing
p
aths like "
.
.
"
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-17
Jeff King
unpack-
t
rees: propagate error
s
a
d
ding en
t
ri
e
s to
t
he
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-10
Jeff King
r
e
ad_pa
c
ked_refs
:
use
s
kip_prefix ins
t
ead of st
a
t
i
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-10
J
eff King
read_pa
c
ked_refs: pass
strbuf to parse
_
ref_lin
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-10
Je
f
f King
r
e
a
d
_packed
_
refs: use a strbuf for reading lines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-09
Ronald Wampler
g
it-am
.
txt: -
-
i
g
nore-date f
l
ag is not pa
s
sed to git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-05
J
unio C
Ha
m
ano
M
e
rge b
r
a
nch 'main
t
'
of g
i
t://git
h
ub
.
c
o
m
/git-l10
n
/git
.
.
.
commit
|
commitdiff
|
tree
2014-12-05
Junio
C Hamano
Sta
r
t post 2
.
2 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-05
Jeff Kin
g
f
or_each_reflog_ent_reverse: tu
r
n leftover check
into
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-05
Jeff King
for_each_reflog_ent_reverse: fix
n
ewlines
on block
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-12-01
Jeff King
p
u
sh: truly use "simpl
e
" as default, not "upstream"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-26
Junio C Haman
o
Git 2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-26
Marc Bra
n
chaud
RelNotes: spelling & grammar
t
weaks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-26
Mi
k
e Hommey
sha1_name: avoid unnece
s
sary sha
1
lo
o
k
up in find_unique
_
abbrev
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-21
Junio C Hamano
Git
2
.
2
.
0
-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-21
Michael
J Gruber
add: ignor
e
only ignored
f
iles
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-20
Jeff King
t
4
026: test
"
normal
"
co
l
or
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-20
Jeff King
config: fix parsing of "git config --get-
c
o
lor s
o
me
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-20
J
e
f
f
King
docs: describe ANSI 256-c
o
lor mo
d
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-19
Junio C Hama
n
o
Merge br
a
nch 'sv/submitting-final-patch'
commit
|
commitdiff
|
tree
2014-11-19
Junio
C
Ham
a
no
M
e
rge branch
's
n
/
t
utorial-status-output-example'
commit
|
commitdiff
|
tree
2014-11-19
Junio C
Hamano
Merge branch 'mh/doc-r
e
mote-helpe
r
-xref'
commit
|
commitdiff
|
tree
2014-11-19
Ju
n
io
C
Ha
m
a
n
o
Merge branc
h
'tb/no-relativ
e
-file-url'
commit
|
commitdiff
|
tree
2014-11-19
Junio C Hamano
Mer
g
e b
r
anch
'cc/int
e
rpret-trailers'
commit
|
commitdiff
|
tree
2014-11-18
Jeff Ki
n
g
gitweb: hack around CG
I
'
s list
-
context param()
h
andling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-18
J
o
nath
a
n Nie
d
er
Makefile: hav
e
pyt
h
on scripts d
e
pe
n
d on NO_PYTH
O
N setting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-18
Jonathan Nieder
M
akef
i
le: simplify by using SCR
I
PT_{PER
L
,
S
H}_G
E
N macros
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-18
Junio C Hamano
Merge gi
t
:
/
/
git
h
u
b
.
com/gi
t
-l10n/git-po
commit
|
commitdiff
|
tree
2014-11-18
Juni
o
C Ha
m
a
no
Merge branch 'j
c
/doc-commit-only'
commit
|
commitdiff
|
tree
2014-11-18
Junio C Hamano
Merge branch
'
ta/tutorial-mo
d
ernize'
commit
|
commitdiff
|
tree
2014-11-18
Junio C Ha
m
ano
M
e
r
ge br
a
nch 'da/
d
ifftool'
commit
|
commitdiff
|
tree
2014-11-18
Jeff King
t960[34
]
: mark
cvsimp
o
r
t
t
e
sts
as requiring perl
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-18
Jeff King
t00
9
0
:
mark add-interactive test
w
i
t
h P
E
RL prer
e
quisi
t
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-11-18
Je
f
f King
Makefi
l
e: have perl
s
cr
i
pts d
e
p
e
nd on NO_PERL s
e
tting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next