repo.or.cz
/
git
/
spearce.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-pull: refuse default merge without branch.*.merge
2006-12-16
Junio C Hamano
git-pull: ref
u
se d
e
fa
u
l
t
m
e
rge w
i
thout branch
.
*
.
merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
J
unio C Hamano
g
it-c
l
one: use
w
ildcard specification f
o
r tracking
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Ju
n
io C Hamano
merge: give a bi
t
prettier merge mes
s
a
ge to "merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Hamano
Me
r
ge
b
ranch '
j
s/show'
commit
|
commitdiff
|
tree
2006-12-14
Junio C H
a
mano
git-reset [--mixed
]
<tree> [--] <paths>
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio
C
H
a
mano
git-res
e
t: make
i
t
work from within a subdirector
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
J
unio C Hamano
git-fetch: make it work
f
rom w
i
thin
a subdirector
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio C Hamano
Merge branc
h
'
mai
n
t'
commit
|
commitdiff
|
tree
2006-12-14
Junio C Hamano
Update git-diff
d
ocumentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio C Ha
m
a
n
o
M
e
rge branch
'jc/
d
iff
-
-cac
h
ed'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Haman
o
g
i
t
-
svn:
a
llow both dif
f
.
color an
d
color
.
diff
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Ham
a
no
config documentation: group
c
olor items together
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C Hamano
Merge b
r
anc
h
'
j
c
/read-tree-ignore'
commit
|
commitdiff
|
tree
2006-12-13
J
unio C Hamano
Merge bran
c
h 'ew/rerere'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Ha
m
ano
Merge b
r
anch 'np/addcomm
i
t
'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Ham
a
no
Me
r
ge b
r
anch '
l
h/branch-rename'
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C Hamano
M
e
rge branch 'jc/
c
ommit-careful'
commit
|
commitdiff
|
tree
2006-12-13
Junio C
H
ama
n
o
Merge
b
r
anch 'ap
/
clon
e
-origin
'
commit
|
commitdiff
|
tree
2006-12-13
Junio
C
H
a
mano
M
e
rge
b
r
anch 'jc/numstat'
commit
|
commitdiff
|
tree
2006-12-13
Junio C
Hamano
Mer
g
e
branch 'rr
/
c
v
s
e
xpor
t
commit'
commit
|
commitdiff
|
tree
2006-12-13
J
u
ni
o
C
H
a
ma
n
o
Me
r
ge branch 'ap
/
branch'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
b
r
anch --c
o
lor: change de
f
ault col
o
r sel
e
c
t
ion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C H
a
m
a
no
Merge branch 'js/mer
g
e
'
commit
|
commitdiff
|
tree
2006-12-13
J
unio C Haman
o
send-pack: tighten
ch
e
cks fo
r
r
emote names
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C
Ha
m
ano
git-push
:
accept tag <tag> as advertised
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C H
a
mano
s
purious
.
sp
in manpages
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio
C
Hamano
gi
t
mer
g
e: reword fail
u
re message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio
C Hamano
Revert
"git-diff
:
Introd
u
ce --i
n
d
e
x
a
nd depr
e
ca
t
e
.
.
.
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C Hamano
Merge
bra
n
ch
'maint'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
git-pus
h
: docu
m
ent removal
o
f remot
e
ref with :<dst
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o
C Haman
o
Merge branch 'mas
t
er' into js/merg
e
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge branch
'm
a
int'
commit
|
commitdiff
|
tree
2006-12-13
Junio
C Hamano
add test case for recursive
merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Jun
i
o C Hamano
diff --numstat: s
h
o
w binary with '-' to match "apply
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
J
u
nio C Hamano
sho
r
t
log: fi
x
seg
f
ault
o
n empty authorname
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C H
a
m
a
no
shortlog:
r
emove "[PATCH]" pref
i
x
f
rom shortlog outpu
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Hamano
Merge bra
n
ch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2006-12-10
Junio C Ham
a
no
git-commit: allow -
-
only to
l
ose what was staged earlier
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-10
Juni
o
C H
a
mano
Documentation/git
-
c
ommit: rewrite to mak
e
it
more
e
n
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-09
Junio
C
H
ama
n
o
git-rerer
e
: add 'gc
'
command
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
J
u
n
i
o C H
a
m
a
no
Fi
x
perl/
b
u
i
ld
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-07
Junio C H
a
m
a
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-06
Jun
i
o C Hamano
g
i
t
-
merge: fix "fix co
n
fu
s
i
on between tag a
n
d bran
c
h
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Juni
o
C
Hamano
g
it-merge: squelch needl
e
ss error
message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio C Ham
a
no
Merge
commit
|
commitdiff
|
tree
2006-12-06
Ju
n
i
o C Hamano
Mer
g
e branc
h
'
m
aint
'
commit
|
commitdiff
|
tree
2006-12-06
J
uni
o
C Hamano
git-re
s
et
t
o
r
e
mov
e
"$GIT_DIR/MERGE_MSG"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
J
u
nio C Hamano
r
ead-tree: document --exclud
e
-
per-di
r
ectory
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
J
unio C Hamano
Loosen "workin
g
fi
l
e will b
e
lost" c
h
eck in Porc
e
lain-ish
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Ju
n
io C
H
am
a
no
read-tr
e
e: furt
h
er loose
n
"
w
orking file will be los
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-05
Ju
n
io
C
Ha
m
ano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2006-12-04
Juni
o
C Hamano
unpack-t
r
e
es: make sur
e
"df_conflict
_
e
n
try
.
name
"
i
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
Junio C Hamano
receive-pack: do not insist on f
a
s
t-forwa
r
d outside
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Junio C
Hamano
merge-recursive:
u
se xdl_merge(
)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Junio C Hama
n
o
xmerge: make return value from x
d
l_merge
(
) mor
e
u
s
able
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
J
unio C H
a
mano
Merge bra
n
ch
'
ma
i
nt'
commit
|
commitdiff
|
tree
2006-12-03
Junio C Hamano
git-merge: fix confusion
b
etween
tag and b
r
anch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Junio C Hamano
Merge master
.
ker
n
el
.
o
r
g
:
/
pub/s
c
m/gitk/g
i
tk
commit
|
commitdiff
|
tree
2006-11-29
Junio C
H
amano
Merge br
a
nch 'm
a
int'
commit
|
commitdiff
|
tree
2006-11-29
Junio C Hamano
tutori
a
l: talk a
b
out user
.
name earl
y
and don't start
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Ju
n
io
C
H
a
m
ano
M
e
r
ge br
a
nch 'jc/g
l
ob
f
etch'
commit
|
commitdiff
|
tree
2006-11-29
Juni
o
C Hamano
Merge
b
r
an
c
h 'm
a
i
n
t'
commit
|
commitdiff
|
tree
2006-11-29
J
u
nio C Hamano
gi
t
blame -C
:
fix outp
u
t format t
w
eak
s
w
h
en crossing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
J
unio C Ha
m
an
o
cvsimport: style f
i
x
up
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Junio C H
a
mano
Merge b
r
anch 'js/sh
o
rtlog'
commit
|
commitdiff
|
tree
2006-11-27
J
u
n
io C Hamano
Me
r
ge branch 'jc/push-de
l
ete-ref'
commit
|
commitdiff
|
tree
2006-11-27
Junio C Hamano
M
e
r
ge branch 'jc/m
e
r
ge'
commit
|
commitdiff
|
tree
2006-11-27
Jun
i
o C
Ham
a
no
git-
m
erge: d
o
not leak rev-parse
output u
s
e
d for ch
e
cking
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Junio
C
Hamano
git-merg
e
: tighten err
o
r checking
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Junio C Ha
m
ano
Merge branch 'jc/pac
k
-peeled'
commit
|
commitdiff
|
tree
2006-11-26
J
u
nio C H
a
mano
grep
:
do not skip unmerged entries
w
hen grepping in
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-26
Junio C Hamano
Merge branch 'jn/we
b
'
commit
|
commitdiff
|
tree
2006-11-25
J
u
n
i
o
C Hamano
fet
c
h-pack: do not bar
f
w
h
en duplicate re patterns
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Junio C Hamano
g
i
t-fetch: allow
forcing glob pattern
in refspec
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Junio
C
Hama
n
o
Merge b
r
anch '
m
as
t
er' into j
c
/globfet
c
h
commit
|
commitdiff
|
tree
2006-11-25
Junio C Ha
m
ano
git-fetch: exit
with n
o
n-z
e
ro status when fast-fo
r
ward
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
J
unio C Hamano
git-commi
t
: show --sum
m
ary a
f
ter successf
u
l commit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
J
unio
C
H
amano
git-shortlo
g
: make com
m
on rep
o
sitory
p
refix configurab
l
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Juni
o
C Hamano
g
it
-
s
ho
r
t
l
og
:
fix comm
o
n rep
o
sitory prefix abbr
e
viation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Junio C Hamano
git
-
branch -D
:
make it work even when on a ye
t
-to-be
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Juni
o
C Hamano
git-clone: stop dumb protocol from copying refs outside
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Ham
a
no
g
itweb: (style) us
e
c
homp without parenth
e
ses consiste
n
tly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hama
n
o
A
l
low git
p
u
s
h
to del
e
te remote re
f
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Ha
m
ano
Merge branch 'jn/we
b
'
commit
|
commitdiff
|
tree
2006-11-24
J
un
i
o
C
Hamano
M
e
r
g
e
branch 'pb/diffroot'
commit
|
commitdiff
|
tree
2006-11-24
Junio C H
a
mano
Merge
b
ra
n
ch 'jc/pack-heuristics'
commit
|
commitdiff
|
tree
2006-11-24
J
u
nio C Hamano
Merge b
r
anch 'jc/n
u
mstat'
commit
|
commitdiff
|
tree
2006-11-24
Junio C
H
amano
M
e
rge
branch 'ap/b
r
anch-ref-display'
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hama
n
o
M
erge
b
ranch 'ap/prune'
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
Typefix builti
n
-prune
.
c::prune_
o
bject
(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Jun
i
o C H
a
mano
M
erge branch 'jc/upload-pac
k
'
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
refs outside
r
ef
s
/{
h
eads,ta
g
s} mat
c
h less
strongly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
git-fe
t
ch: allow glo
b
pattern in refspec
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Junio
C
H
amano
git-fetch: f
i
x dumb prot
o
col trans
p
ort to fetch
from
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
git-
f
etch:
reuse ls-remote resu
l
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-23
Junio C Hamano
GIT 1
.
4
.
4
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-23
Jun
i
o C Haman
o
tru
s
t-executable-bit: fix
b
r
e
akag
e
for symlinks
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-22
Junio C Hamano
Sto
r
e peeled
r
e
fs in pack
e
d-re
f
s
(
take 2)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-22
Juni
o
C Hamano
me
r
ge
:
allow mergin
g
in
t
o a
y
et-to-be-born br
a
nch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-22
Junio
C Hamano
git-merg
e
: ma
k
e i
t
usable as
t
he fi
r
st
c
lass UI
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next