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 'js/branch-config'
2006-12-18
Junio C H
a
m
a
n
o
Merge bra
n
ch 'j
s
/branch-config'
commit
|
commitdiff
|
tree
2006-12-18
J
u
n
i
o C Hamano
M
e
rge branch 'jn/web
'
(early part)
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
a
v
oid acc
e
s
s
ing _all_
loose re
f
s in git-sh
o
w-ref -
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
git-
f
etch
:
A
v
oid reading pac
k
ed
refs
over and
over
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
J
unio C Hamano
m
a
r
k
u
p
fix
i
n svn
i
mport docu
m
entatio
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Junio
C
Hama
n
o
Fix m
i
s-mar
k
-u
p
in git-mer
g
e
-
file
.
t
xt documen
t
ation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Ju
n
io C Hamano
Fix
c
h
eck_file
_
direc
t
o
r
y_conflict
(
)
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
J
unio C Hamano
git-add: remove c
o
nfl
i
cting en
t
ry when adding
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
update
-
in
d
ex
:
make D/F
conflict error a bit more verbose
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Junio C
H
amano
merge: g
i
ve a
bit p
r
ettier
m
erge
m
es
s
age t
o
"merge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Ju
n
io C Ham
a
n
o
Me
r
ge
b
ranch 'js/show'
commit
|
commitdiff
|
tree
2006-12-14
J
unio
C
Haman
o
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-reset: make
i
t
work
f
ro
m
wi
t
hi
n
a
subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-14
Junio
C H
a
ma
n
o
g
i
t
-fetc
h
: make it wo
r
k
f
r
om with
i
n a subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-14
Junio
C
Hamano
Merge branch '
m
a
i
nt'
commit
|
commitdiff
|
tree
2006-12-14
Junio
C H
a
mano
U
pdate git
-
diff documenta
t
ion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-14
Jun
i
o C
H
amano
Merg
e
branch 'jc/di
f
f
--cached'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
git-svn: allow
b
oth diff
.
color and colo
r
.
diff
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio
C Hamano
config
documen
t
ation: group colo
r
items
t
ogeth
e
r
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
J
unio C Hamano
M
erge br
a
nch
'
jc
/
read-tree-ignor
e
'
commit
|
commitdiff
|
tree
2006-12-13
J
unio C
H
am
a
no
Merge bra
n
ch 'ew/rerere'
commit
|
commitdiff
|
tree
2006-12-13
Junio
C
Hamano
Merge branch 'np/addcommit'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hama
n
o
Merge br
a
n
c
h
'lh/branch-rename'
commit
|
commitdiff
|
tree
2006-12-13
J
u
ni
o
C Hama
n
o
Me
r
g
e
bra
n
c
h 'jc/commit-careful'
commit
|
commitdiff
|
tree
2006-12-13
Ju
n
io C Hamano
Merge branch 'ap/cl
o
n
e-origin'
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C
H
amano
Merg
e
b
ranch 'jc/numstat'
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C H
a
m
ano
Merge branch
'rr/cvsex
p
ortco
m
m
i
t'
commit
|
commitdiff
|
tree
2006-12-13
Junio C
H
amano
Merg
e
br
a
nch 'ap/
b
r
a
n
c
h'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
branch --color: chan
g
e def
a
ult
c
olor
selec
t
i
o
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C
H
amano
Mer
g
e branc
h
'js/mer
g
e'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
send-pac
k
: t
i
g
h
ten
c
h
e
cks for r
e
m
o
te
n
ames
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
gi
t
-push
:
ac
c
ept tag <
t
ag
>
as ad
v
ertised
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
spu
r
io
u
s
.
s
p
in m
a
n
pages
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
git m
e
r
g
e: reword
f
a
i
l
ure message
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C Hamano
R
e
v
ert "
g
it-diff: In
t
roduce --index a
n
d dep
r
ecate
.
.
.
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-13
Junio C
Ha
m
ano
git-push: d
o
cumen
t
removal o
f
remot
e
ref with :<dst
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
J
unio C
Ha
m
a
n
o
Merg
e
b
ranch 'master' into js/merg
e
commit
|
commitdiff
|
tree
2006-12-13
J
unio
C Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-13
Junio
C
Hamano
add test cas
e
for recursive merge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Ha
m
an
o
di
f
f --nu
m
stat:
show bina
r
y
wi
t
h '-' to match "apply
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
Jun
i
o C Hamano
short
l
og:
f
ix se
g
fault on em
p
ty
a
uthorn
a
me
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
Junio C H
a
mano
short
l
o
g: r
e
move "[PATCH]" prefix fro
m
sh
o
rtlog outpu
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
J
unio C
H
amano
Merg
e
branch
'maint'
commit
|
commitdiff
|
tree
2006-12-10
J
u
nio C Ha
m
ano
git-commit:
allow --only to lose w
h
at was staged earl
i
e
r
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-10
Junio C H
a
mano
Documentati
o
n
/
git-comm
i
t: rewrite to
make it more end
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-09
Junio
C
Hamano
git-rer
e
re: add
'g
c
' command
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-08
J
uni
o
C Hamano
Fix perl
/
build
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-07
Junio C Hamano
M
e
rge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2006-12-06
J
un
i
o
C Hamano
git
-
me
r
ge:
fix "f
i
x confusio
n
between
t
ag and branch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hamano
git-merge
:
squelc
h
n
eedle
s
s err
o
r
m
essage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Jun
i
o C Haman
o
Merge
commit
|
commitdiff
|
tree
2006-12-06
Jun
i
o C Hamano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2006-12-06
Junio C
H
amano
gi
t
-reset to remove
"$G
I
T
_
DIR/MERG
E
_MSG"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
J
unio C Haman
o
r
ead-tre
e
: document --ex
c
lude-per-directo
r
y
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Ju
n
i
o
C
Hamano
Loosen "working file wi
l
l be lost" check in Porcelain-is
h
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hamano
read-tree: f
u
rther loosen "wor
k
ing file wil
l
be lost
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-05
J
u
nio
C
Ham
a
no
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2006-12-04
J
u
n
io
C Hamano
u
npack-trees: make su
r
e "d
f
_confli
c
t_entry
.
name" i
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-04
Jun
i
o C Hamano
receive-
p
ack
:
do not insist on fast-forward outside
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
Junio
C
Hama
n
o
merge-recurs
i
ve: us
e
xdl_merg
e
()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
J
u
nio C Hamano
xme
r
ge:
m
ake return value from xd
l
_me
r
ge() more usable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
J
u
nio C Hamano
M
e
rg
e
b
ranch
'
ma
i
nt'
commit
|
commitdiff
|
tree
2006-12-03
Junio C Hamano
git-merg
e
: fix confusion between tag and branch
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
Juni
o
C Hama
n
o
Merg
e
master
.
kernel
.
org:/pub/scm/g
i
tk/git
k
commit
|
commitdiff
|
tree
2006-11-29
Junio C
H
ama
n
o
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2006-11-29
J
u
nio C Haman
o
tu
t
o
r
ial: tal
k
about
u
ser
.
n
a
me early and don't start
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
Junio C Hamano
Merge bran
c
h '
j
c/gl
o
bfet
c
h'
commit
|
commitdiff
|
tree
2006-11-29
J
unio C
H
ama
n
o
Mer
g
e
b
r
anch 'ma
i
nt'
commit
|
commitdiff
|
tree
2006-11-29
Junio C Hama
n
o
git b
l
ame -C
:
fix out
p
ut form
a
t tweaks whe
n
crossing
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Ju
n
i
o
C
Hamano
cv
s
im
p
ort: style fixup
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
J
unio C Hamano
M
e
r
g
e branch 'js/shortlog'
commit
|
commitdiff
|
tree
2006-11-27
Junio C Hamano
Merge branch 'jc/pu
s
h-d
e
lete-ref'
commit
|
commitdiff
|
tree
2006-11-27
Jun
i
o C Hamano
M
erge
b
ran
c
h '
j
c/mer
g
e'
commit
|
commitdiff
|
tree
2006-11-27
Ju
n
io C Hamano
git-merg
e
: do not le
a
k r
e
v-parse output used
f
o
r
checking
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Juni
o
C Hamano
git
-
merge
:
tigh
t
en
e
rror checking
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Junio
C
H
a
mano
Merge branch
'
jc/pac
k
-
p
eeled'
commit
|
commitdiff
|
tree
2006-11-26
Junio C
H
amano
g
r
e
p
:
d
o
n
ot
skip
u
nme
r
ged ent
r
ies
w
hen
g
r
e
pping
i
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-26
Junio C
H
a
m
ano
Merge branch 'j
n
/web'
commit
|
commitdiff
|
tree
2006-11-25
J
u
nio C
Hamano
fetc
h
-pack
:
d
o not
b
arf when duplicate r
e
patterns
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Junio C Ha
m
ano
g
i
t
-f
e
tch: allow
forcing g
l
ob patte
r
n in refsp
e
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
J
u
nio C Hamano
Merge
b
ra
n
ch 'mast
e
r' into jc/globfe
t
ch
commit
|
commitdiff
|
tree
2006-11-25
Junio C Hamano
git-fetch:
e
xit with non-zero status
w
h
en fast-forward
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
J
u
nio C Haman
o
git-commit: show --sum
m
ary after su
c
cessful
c
ommit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Ju
n
io C Hamano
git-sh
o
rtlo
g
: make common rep
o
sitory prefix
c
onfig
u
rable
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
J
u
nio C Hamano
git-shortlog:
f
ix c
o
mmon repository prefix abbreviation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
J
unio C Hamano
git-branch -D: m
a
ke it work even when on
a yet-to-be
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Junio C Haman
o
git-c
l
one:
stop dumb protocol
f
r
om copy
i
n
g
refs outs
i
de
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
J
unio C Ham
a
no
gitweb: (s
t
yle
)
use cho
m
p
w
ithout p
a
rentheses
consistently
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
J
unio
C
Hamano
Allow git push t
o
delete remote ref
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Jun
i
o C H
a
m
a
no
Merge br
a
nch 'jn/
w
e
b'
commit
|
commitdiff
|
tree
2006-11-24
J
u
nio C Hamano
Merge br
a
nch
'pb/diffroot'
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
M
e
rge branch 'jc/pa
c
k-h
e
uri
s
tics
'
commit
|
commitdiff
|
tree
2006-11-24
J
u
nio C Hamano
Me
r
ge b
r
anch 'jc/n
u
mstat'
commit
|
commitdiff
|
tree
2006-11-24
Junio C
Hamano
Me
r
ge branch 'ap/b
r
anch-ref-di
s
play'
commit
|
commitdiff
|
tree
2006-11-24
Junio
C Hamano
Merge branch 'ap
/
prune'
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
T
y
p
efix builtin-
p
rune
.
c::prune_obje
c
t()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Ha
m
a
n
o
Merge branch 'jc/upload-pack'
commit
|
commitdiff
|
tree
2006-11-24
J
unio C Hamano
ref
s
outs
i
de
refs/{heads,tags
}
match less strongly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Juni
o
C Ham
a
no
g
it-fetch: allow g
l
ob
pattern in refspec
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next