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
Merge branch 'jc/test-clone' into jc/clone
2006-12-19
Junio
C Hamano
Merge branch 'jc/test-c
l
one'
i
nto jc
/
c
lon
e
commit
|
commitdiff
|
tree
2006-12-19
Ju
n
io C Haman
o
Revert "fix t
e
st
s
uite:
m
ake sure they use templa
t
e
s
.
.
.
commit
|
commitdiff
|
tree
2006-12-19
J
u
nio C Hamano
fix testsuite: make
s
ur
e
t
h
e
y u
s
e templates fresh
l
y
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-19
Ju
n
io C Hamano
rer
e
re
:
fix breakage
o
f resolving
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
Junio C H
a
m
ano
r
acy-
g
i
t
: documentation updates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
J
u
ni
o
C H
a
mano
s
h
ow-r
e
f: fix --exclude-existing
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
Juni
o
C Hamano
par
s
e-
r
emo
t
e::e
x
pa
n
d
_refs_
w
ildcard()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
Juni
o
C Hamano
s
h
o
w-ref:
f
i
x --verify
-
-hash=length
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
Jun
i
o C Hamano
show-ref: fi
x
--
q
uiet
--ve
r
ify
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
J
u
nio C Hama
n
o
M
e
rge branch 'jc
/
blame-boundary'
commit
|
commitdiff
|
tree
2006-12-18
Jun
i
o C Hamano
Merge br
a
nch 'jc/reflog'
(
ea
r
ly part)
commit
|
commitdiff
|
tree
2006-12-18
Juni
o
C Hamano
Merge bran
c
h 'js/br
a
nch-config'
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
Merge
branch 'j
n
/web' (
e
arly part)
commit
|
commitdiff
|
tree
2006-12-18
Junio
C
Hamano
avoid
accessing _all_ l
o
ose
r
e
f
s i
n
gi
t
-show
-
ref -
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
Junio
C Ham
a
no
gi
t
-fetch: Avoi
d
r
e
ading
p
ac
k
e
d
refs over and over
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Junio
C Hamano
Teach
s
ho
w
-branch how
t
o show re
f
-log
d
at
a
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Ju
n
io C
H
amano
markup fix in svnimport
documentation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
Fix mis-ma
r
k-u
p
in
git-merg
e
-file
.
tx
t
documen
t
ation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Junio C H
a
mano
Fix check_file_directory_confl
i
ct
(
)
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
git-
a
d
d
: remove confl
i
cti
n
g entry when addi
n
g
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
J
unio
C
Hamano
up
d
ate
-
index: make
D
/F conflict error a bit more verbo
s
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Junio C
H
amano
g
i
t
-clone: lose
the traditional '
n
o-s
e
par
a
t
e
-remot
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Jun
i
o C
Hama
n
o
git-clone: lose
th
e
artificial "fir
s
t
" fetch refspe
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Junio
C Hamano
gi
t
-pull: refu
s
e
d
ef
a
ult merge w
i
thout
br
a
nch
.
*
.
merge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Junio C H
a
mano
g
it-clone: u
s
e wildcard specific
a
tion for
t
racking
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Junio C H
a
mano
merge: give a bi
t
prettier merge message t
o
"merg
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Hamano
Me
r
ge b
r
anc
h
'js/show'
commit
|
commitdiff
|
tree
2006-12-14
Junio C
Hamano
gi
t
-reset [--mixed
]
<tree> [--] <pat
h
s>
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-14
Ju
n
io C Hamano
git-
r
eset: make it work from within
a
sub
d
ire
c
to
r
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-14
Junio C Hamano
g
it-f
e
tch: make it
w
ork from
within
a subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-14
J
u
n
i
o C Ham
a
no
Merge bran
c
h 'maint
'
commit
|
commitdiff
|
tree
2006-12-14
J
unio C Hamano
Upd
a
te git
-
diff documenta
t
io
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-14
J
unio C Hamano
Merge branch
'
j
c
/diff--cached'
commit
|
commitdiff
|
tree
2006-12-13
Junio C
Ham
a
no
g
i
t-svn: allow both di
f
f
.
c
o
lor and color
.
diff
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
c
o
nfi
g
documenta
t
ion: g
r
oup
c
o
lor items together
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio C H
a
mano
g
i
t-b
l
ame:
s
ho
w
lines a
t
tributed to b
o
u
n
dary commits
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hama
n
o
Merge branch 'jc
/
read-t
r
ee-ignore'
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C
H
a
m
ano
Merge
b
r
a
n
ch 'ew/rerer
e
'
commit
|
commitdiff
|
tree
2006-12-13
Junio C H
a
ma
n
o
Merge branch 'np/addcommit'
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio C Hamano
M
e
rge branch 'l
h
/bra
n
ch-rename'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge b
r
anch 'jc/commit-careful'
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o
C
Hamano
Merge branch 'ap/clone-origin'
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C Hamano
Merge branch
'jc/nu
m
stat'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge br
a
nch 'rr/cvsexportcomm
i
t'
commit
|
commitdiff
|
tree
2006-12-13
Ju
n
io C Hamano
Merge b
r
anch 'ap/branch
'
commit
|
commitdiff
|
tree
2006-12-13
Junio
C
H
aman
o
branch -
-
color:
c
han
g
e
def
a
ult c
o
lor selection
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C Hamano
Merge bra
n
ch 'js/merge'
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio C
Ha
m
ano
send-pack:
tight
e
n checks for remote
names
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
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
Juni
o
C Ha
m
an
o
spurious
.
sp in manpages
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
git me
r
ge: reword failure messa
g
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Revert "git-diff: Introduce
--in
d
ex and
d
eprecate
.
.
.
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-13
Junio C
Hamano
git-push
:
docum
e
nt rem
o
v
al
o
f remote ref
w
i
t
h :<dst
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge branch
'
m
a
ster' i
n
to j
s
/merge
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio
C H
a
m
a
no
Merge branch
'maint'
commit
|
commitdiff
|
tree
2006-12-13
Junio C H
a
m
a
no
a
d
d test case for recursive merge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Hamano
diff --n
u
mstat: sh
o
w binary with '-
'
t
o
m
atch "
a
pply
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Ha
m
ano
shortlog: fix segfault on empty autho
r
name
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
Juni
o
C
Hamano
sho
r
tlog: r
e
move "[PAT
C
H
]
"
pr
e
fix from shortlog output
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
Juni
o
C Ha
m
ano
Merge br
a
n
ch 'mai
n
t'
commit
|
commitdiff
|
tree
2006-12-10
Junio
C
H
am
a
no
git-commit:
allow --o
n
ly to lo
s
e wh
a
t
was
staged earlie
r
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-10
Junio
C Ha
m
ano
Documentation/git-comm
i
t
:
rewrite to make it more e
n
d
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-09
Junio C Hamano
git-
r
erere: add 'gc' comman
d
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-08
Junio C Hamano
Fix perl/ build
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-07
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-06
Junio
C
Hama
n
o
git-merge:
fix "fix confusion between tag and branch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
J
un
i
o C Hamano
git-merge:
s
quelch nee
d
le
s
s er
r
o
r
me
s
sa
g
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Jun
i
o C Hamano
Mer
g
e
commit
|
commitdiff
|
tree
2006-12-06
Junio C
Hamano
Merge b
r
anch 'main
t
'
commit
|
commitdiff
|
tree
2006-12-06
Jun
i
o C Ham
a
no
g
i
t-reset to re
m
ove
"
$
G
I
T_
D
IR/MERGE_MSG"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Junio
C
Hamano
read-tree: document --exclude-per-directory
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hamano
Loos
e
n "wor
k
ing file will be lost" check in Porcelain-ish
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Jun
i
o C Hamano
r
ead-tree
:
further lo
o
sen "working fi
l
e will be lost
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-05
Junio C Ham
a
n
o
Merg
e
branch 'main
t
'
commit
|
commitdiff
|
tree
2006-12-04
Junio C Hamano
u
n
pack-trees: m
a
ke sure
"
df_con
f
l
ict
_
entry
.
name
"
is
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-04
J
u
nio C Ham
a
no
receive-pack
:
do not insist on fa
s
t-
f
orward outside
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
Junio C Ham
a
no
merge-re
c
ursive: u
s
e
xdl_m
e
r
ge()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
Junio
C
Hamano
x
me
r
ge: make ret
u
rn value fr
o
m x
d
l_merg
e
(
)
more
u
s
a
b
l
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
Jun
i
o C Hamano
M
e
rge
b
ran
c
h 'maint'
commit
|
commitdiff
|
tree
2006-12-03
J
u
ni
o
C Hamano
g
it
-
merge: fix
confu
s
ion betw
e
en t
a
g an
d
bra
n
ch
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
Junio
C
Hamano
Mer
g
e master
.
kernel
.
org:/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2006-11-29
Ju
n
io C Ha
m
ano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2006-11-29
Junio C Hamano
tuto
r
ial: talk
about u
s
er
.
name ea
r
ly and don't start
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
J
u
nio C H
a
mano
Merge bran
c
h
'jc/globfe
t
ch'
commit
|
commitdiff
|
tree
2006-11-29
Junio C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-11-29
J
unio C Hama
n
o
git blame
-C:
f
ix output
format t
w
e
a
ks whe
n
c
ros
s
ing
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Ju
n
io C Hamano
c
vsimport: 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
M
e
rg
e
branch 'js/shortlog'
commit
|
commitdiff
|
tree
2006-11-27
Junio
C
Hamano
Mer
g
e
b
ranch
'
j
c/push-de
l
e
te-ref'
commit
|
commitdiff
|
tree
2006-11-27
Junio C
H
amano
Merge
b
ranch
'jc/me
r
ge'
commit
|
commitdiff
|
tree
2006-11-27
Ju
n
i
o
C
Hamano
git-m
e
rge:
do not leak rev
-
parse output
u
s
ed for checking
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Junio
C Hamano
git-m
e
rge:
tighten err
o
r
chec
k
i
n
g
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Junio C Hamano
Mer
g
e branch
'
j
c
/pack-peel
e
d
'
commit
|
commitdiff
|
tree
2006-11-26
J
un
i
o C Hamano
grep: do not skip unmerged entrie
s
when grep
p
i
ng
i
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-26
Junio C
H
amano
Merge bra
n
ch
'
jn/web'
commit
|
commitdiff
|
tree
2006-11-25
Junio
C
Hamano
f
e
tch-pack: do not
barf when
du
p
licate re patterns
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Junio
C H
a
mano
git-fetch: allow forcing g
l
ob pattern in refspec
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Junio C Ham
a
no
Mer
g
e b
r
a
n
c
h
'
master' into jc/
g
lobfetch
commit
|
commitdiff
|
tree
2006-11-25
J
un
i
o C Hama
n
o
git-fetch: exit with non-zero status when f
a
st
-
f
o
rward
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next