repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Revert "fix testsuite: make sure they use templates freshly built from the source"
2006-12-19
Junio
C Hamano
Revert "fi
x
testsu
i
te: make s
u
re
t
hey use
t
emp
l
at
e
s
.
.
.
commit
|
commitdiff
|
tree
2006-12-19
Junio C
Hamano
fix tests
u
ite
:
make sure
t
hey
u
se templ
a
tes
f
reshly
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C
H
ama
n
o
rerere: f
i
x
breaka
g
e of resolving
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio
C H
a
mano
racy-g
i
t:
d
o
cumenta
t
ion updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
J
unio
C Hamano
show-
r
ef: f
i
x --exclude-ex
i
sting
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Ju
n
io C Hama
n
o
pa
r
se-remote::expand_
r
efs_wildcard()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
J
u
nio C H
a
ma
n
o
s
h
ow-ref:
f
ix --verify --
h
ash=length
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Jun
i
o
C
Haman
o
show-ref: fix --quiet --verify
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Jun
i
o C
H
amano
Merg
e
branch 'jc/blam
e
-bou
n
dar
y
'
commit
|
commitdiff
|
tree
2006-12-18
Jun
i
o C
Hamano
Merge branch 'j
c
/reflog'
(early
p
art
)
commit
|
commitdiff
|
tree
2006-12-18
Jun
i
o C
H
amano
Merge
b
ranch 'js/bra
n
ch-config'
commit
|
commitdiff
|
tree
2006-12-18
Ju
n
io C Hamano
Merge branch
'
jn/w
e
b' (early p
a
rt)
commit
|
commitdiff
|
tree
2006-12-18
Junio C
Hamano
avoid acc
e
ssing _all_ lo
o
se ref
s
i
n
git-show-ref -
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C
H
a
mano
git-fetch: Avoid readin
g
packed r
e
fs over and over
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C H
a
m
a
no
Teac
h
show-branch how
t
o
s
how re
f
-lo
g
dat
a
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio
C H
a
mano
markup fix in s
v
nim
p
or
t
documentation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
Fi
x
m
is-
m
a
r
k
-u
p
in git-merge-file
.
t
x
t doc
u
mentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
Fix check_file_di
r
e
ct
o
ry_conflict(
)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Ham
a
no
git-add
:
remove
confl
i
cting
entry wh
e
n addin
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
J
un
i
o C
H
aman
o
update-index
:
make D/F c
o
nflict er
r
or a bit more ve
r
bose
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
J
unio C Hamano
merge: give a bi
t
prettier merge message
t
o "mer
g
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Juni
o
C
Ha
m
ano
Merge
branch
'js/show
'
commit
|
commitdiff
|
tree
2006-12-14
Ju
n
io C Hamano
g
i
t-reset [--mixe
d
] <tree> [-
-
] <paths>
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio C Hamano
g
i
t-reset: make it work
from within a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio C
Hamano
g
it-fetch: make it work fr
o
m
within a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio C Hamano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2006-12-14
Junio
C Ha
m
ano
Update git-diff documentat
i
on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
J
un
i
o C Hamano
Merge b
r
anch 'jc
/
diff-
-
cached'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
git-svn: allow both d
i
ff
.
colo
r
and
c
olor
.
diff
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C
Hamano
c
o
n
fig documen
t
ation:
g
roup color
i
tems together
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Ju
n
io C
H
amano
git-blame: s
h
ow
lines attr
i
but
e
d to boundary comm
i
ts
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Me
r
ge bran
c
h 'jc/read
-
tr
e
e
-ignore'
commit
|
commitdiff
|
tree
2006-12-13
J
u
n
io
C
Ham
a
no
Merge branc
h
'ew/rerere'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merg
e
bran
c
h 'np/
a
ddcommit'
commit
|
commitdiff
|
tree
2006-12-13
Junio C
H
amano
Merge branch
'lh/branch-rename
'
commit
|
commitdiff
|
tree
2006-12-13
Ju
n
io C H
a
mano
Merge branch 'jc/commit-careful'
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o
C
Hamano
Merge b
r
anch 'ap/clone-
o
r
i
gin'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
M
e
r
ge
b
ranch 'jc/numstat'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge branch
'rr/cv
s
exportcommit'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Ham
a
no
M
e
rge bra
n
ch '
a
p/branch'
commit
|
commitdiff
|
tree
2006-12-13
Junio C
H
amano
b
ranch --co
l
or: chan
g
e
d
e
fault color select
i
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio
C
Hamano
M
e
r
ge branc
h
'j
s
/merge'
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C Hamano
send-pa
c
k
:
tighten
ch
e
c
ks for
r
emote names
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
git-push:
accept
tag <tag> as
a
d
vertised
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C Hama
n
o
spurious
.
sp in
manpages
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
u
n
io C
H
amano
g
it merge: reword f
a
i
l
ure message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio
C Hamano
R
e
vert "git
-
diff: I
n
t
r
oduce
-
-index and
d
eprecat
e
.
.
.
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hama
n
o
Merge branch
'
m
a
i
nt'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
g
i
t-push: document remo
v
al of remote ref with :<dst
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
unio C Ham
a
n
o
Merge bran
c
h 'master' into js/
m
erge
commit
|
commitdiff
|
tree
2006-12-13
J
u
n
io C Hama
n
o
Merge branch '
m
aint
'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hama
n
o
add test
c
ase
fo
r
recu
r
siv
e
merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Ha
m
a
no
diff --numst
a
t: sho
w
binary wi
t
h '
-
' to match "apply
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Ham
a
no
shortlog: fix se
g
fault
on empty au
t
h
o
rname
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Hamano
sh
o
rtlog: r
e
mo
v
e "[PATC
H
]" prefix from sh
o
rtlog output
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Hamano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2006-12-10
Junio C Hamano
git-commit: allow
-
-
only
t
o lose what was staged e
a
rlier
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-10
Junio C Hamano
Documentation/
g
i
t-
c
om
m
it: rewrit
e
to mak
e
it more en
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-09
Junio C H
a
man
o
g
it-rerere
:
add 'gc
'
comman
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
J
u
n
io
C
H
a
m
ano
Fix perl/ build
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-07
Junio C Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2006-12-06
Ju
n
io C Ham
a
n
o
g
it-merge: fix "
f
ix co
n
fusion between tag an
d
branch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hamano
gi
t
-merge:
squelch needless e
r
ror
message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio C Ha
m
ano
Merge
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hamano
Mer
g
e branch
'
m
a
int'
commit
|
commitdiff
|
tree
2006-12-06
Jun
i
o C Hama
n
o
git-re
s
e
t to remove "$GIT_DIR/MERGE_MSG"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hamano
read-tree: docume
n
t --exclude-per-directory
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio C Ham
a
n
o
Lo
o
s
e
n "workin
g
file will be lost" ch
e
ck i
n
P
orce
l
ai
n
-
i
s
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hamano
read-tr
e
e: furthe
r
loos
e
n
"
working file will be
lost
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-05
Juni
o
C Ha
m
a
no
M
e
rge branch
'
maint'
commit
|
commitdiff
|
tree
2006-12-04
Junio C Ha
m
a
no
u
n
pack-trees: m
a
ke sure "df_
c
onflict_e
n
t
r
y
.
n
ame
"
i
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
Jun
i
o C Hamano
receive-pack: do
n
ot insis
t
on fast-forward outs
i
de
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Junio C Hamano
m
e
rge-recursive: use xdl_merge()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Junio C Hamano
xmerg
e
:
m
ake return v
a
l
u
e
from xd
l
_merge() more
usable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Ju
n
io C Ham
a
no
Merge branch '
m
a
int'
commit
|
commitdiff
|
tree
2006-12-03
J
unio C Hamano
git-me
r
ge: fix conf
u
sion between
t
a
g and bra
n
ch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Junio
C
Hamano
Merge m
a
ster
.
k
e
r
n
el
.
org
:
/pub
/
scm/gi
t
k/gitk
commit
|
commitdiff
|
tree
2006-11-29
Ju
n
io C Hamano
Merge branch '
m
ain
t
'
commit
|
commitdiff
|
tree
2006-11-29
Junio C Hamano
t
utorial:
t
alk
about user
.
name
early and don't
start
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Ju
n
io C Hamano
M
e
rge
br
a
nc
h
'j
c
/g
l
o
b
fetch'
commit
|
commitdiff
|
tree
2006-11-29
J
u
n
i
o
C Haman
o
M
e
rge bra
n
ch 'maint
'
commit
|
commitdiff
|
tree
2006-11-29
Ju
n
io C Hamano
gi
t
b
lame -C: fix
o
utput f
o
rmat tweaks w
h
en crossing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Juni
o
C Hamano
c
vsimport:
s
tyle fixup
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Juni
o
C Hamano
Merg
e
branch 'js/shortlog'
commit
|
commitdiff
|
tree
2006-11-27
Junio C Hamano
Merge branch 'jc/
p
us
h
-d
e
lete-ref'
commit
|
commitdiff
|
tree
2006-11-27
Junio C H
a
m
ano
Merge branc
h
'jc/merge'
commit
|
commitdiff
|
tree
2006-11-27
Ju
n
io C H
a
mano
gi
t
-m
e
r
g
e: do not leak rev-parse output
used
for checking
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Junio C Hamano
g
i
t-merge: tighten
e
rror checking
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Junio C Hamano
Me
r
ge branch 'jc/
p
ack-peeled'
commit
|
commitdiff
|
tree
2006-11-26
Junio C Hamano
grep: do not skip unmerge
d
ent
r
i
es
w
he
n
gr
e
p
p
ing in
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-26
Junio
C Hamano
Merge branch
'jn/web'
commit
|
commitdiff
|
tree
2006-11-25
J
uni
o
C Hamano
fetch-
p
ack: do n
o
t ba
r
f when
d
uplicate
r
e patterns
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Jun
i
o C Hamano
gi
t
-fetc
h
:
allow forcin
g
glob pa
t
tern in refspec
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Junio
C
Hamano
Merge
bra
n
ch 'master' into jc/globfetch
commit
|
commitdiff
|
tree
2006-11-25
Junio
C
Hamano
g
it-fetch: exit with
n
on
-
zer
o
status
when fast-for
w
a
rd
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Jun
i
o C Hamano
git-commit: s
h
ow
-
-summ
a
ry after successful commit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Junio C
H
a
mano
gi
t
-shortl
o
g: make c
o
mmon re
p
o
sitory prefi
x
config
u
rable
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Junio
C Haman
o
gi
t
-
shortlog: fi
x
common rep
o
sito
r
y
p
refi
x
abbreviatio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Juni
o
C
Hamano
git-branch -D: make it work
even when o
n
a yet-to
-
be
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Juni
o
C Hamano
g
i
t-clone: stop dumb
protocol fr
o
m
copying
r
efs outside
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next