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
Fix check_file_directory_conflict().
2006-12-17
Junio C
H
a
mano
F
i
x check_file_direc
t
o
ry_conflict()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Ju
n
io C Ham
a
no
git-add:
r
emove
c
onfl
i
cting entry whe
n
adding
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
upda
t
e-index: make D/F co
n
f
lict error a bit mo
r
e
verbose
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Jun
i
o C Haman
o
merge: give a bit prettier merge messa
g
e
to "merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Hamano
Merge branch 'js/sho
w
'
commit
|
commitdiff
|
tree
2006-12-14
Junio C Hamano
git-re
s
et
[
-
-mixed] <tree> [--] <paths>
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
J
u
nio C Ham
a
n
o
g
i
t-reset: make
it wo
r
k from within a
subd
i
recto
r
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio C Hamano
g
it-fetch: m
a
ke it
work from w
i
thin a
subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio C Hama
n
o
Me
r
ge b
r
a
n
ch 'maint'
commit
|
commitdiff
|
tree
2006-12-14
Junio
C H
a
mano
U
pdat
e
g
it-diff do
c
umentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio
C
H
a
ma
n
o
Merge branch 'jc/diff--ca
c
hed'
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio C Hama
n
o
git-svn: allo
w
both di
f
f
.
color and
c
olo
r
.
diff
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C
H
ama
n
o
con
f
ig docu
m
e
n
tation: group color
i
t
ems
t
ogether
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C H
a
mano
M
erge branch 'jc/read-tree-
i
g
n
o
re'
commit
|
commitdiff
|
tree
2006-12-13
Ju
n
io C Hamano
Merge b
r
anch 'ew/rerere'
commit
|
commitdiff
|
tree
2006-12-13
Junio C
Ha
m
ano
Merge branch
'
n
p/addc
o
mmit'
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio
C Hamano
M
e
r
g
e branch 'lh/
b
r
anch-
r
ename'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge
b
ranch
'
jc/commi
t
-careful'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Me
r
ge b
r
anch 'ap/clone-origi
n
'
commit
|
commitdiff
|
tree
2006-12-13
Junio
C
Hamano
Merge branch 'jc/numstat'
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o
C Ham
a
no
M
e
rge
branch 'rr/
c
vsexportcommit'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Ham
a
no
Merg
e
bra
n
ch 'a
p
/
b
ran
c
h
'
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C Hamano
bra
n
ch
-
-colo
r
: change def
a
ult c
o
lor select
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio C Hamano
Merge bra
n
ch 'js
/
merge'
commit
|
commitdiff
|
tree
2006-12-13
J
unio C Hamano
se
n
d-pac
k
: tighten checks fo
r
r
e
mote names
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Ham
a
no
git-push:
a
ccept tag <
t
a
g
>
as advertised
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
u
n
i
o C Haman
o
spurious
.
sp in manp
a
ges
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio
C Hamano
git merge:
r
eword fa
i
lure m
e
ssage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio C Hamano
Revert "git-diff: In
t
roduce --index and depreca
t
e
.
.
.
commit
|
commitdiff
|
tree
2006-12-13
Junio
C Ha
m
ano
Merg
e
bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Ha
m
ano
git-push: docum
e
nt removal o
f
remo
t
e
r
e
f with :<d
s
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C
H
a
ma
n
o
Merge
b
r
anch
'
maste
r
' into js/merge
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
M
e
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-13
Junio
C
H
amano
a
d
d test case for
r
ecursive m
e
rge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
J
unio C Ham
a
no
d
i
ff
-
-
nu
m
stat: show binary wi
t
h '-'
to match "apply
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio
C
H
a
mano
shortlog: fix se
g
fault on emp
t
y autho
r
name
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
J
unio C Hamano
shortlog
:
remove "[
P
ATC
H
]" prefix
f
r
o
m
short
l
og out
p
u
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio
C
H
a
m
ano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2006-12-10
Ju
n
i
o C Hamano
git-c
o
mmit: allow --only to lose wha
t
was
s
tage
d
earlie
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-10
Juni
o
C
Hamano
Document
a
tio
n
/g
i
t-commit
:
rewrit
e
to make it more end
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-09
J
unio C H
a
ma
n
o
git
-
rerere: add '
g
c
'
comma
n
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
Junio C Haman
o
Fix perl/ build
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-07
Junio C
H
amano
Merge b
r
a
nch
'm
a
int'
commit
|
commitdiff
|
tree
2006-12-06
Juni
o
C Hamano
g
it
-
me
r
g
e: fix "fix
confusion be
t
ween tag and b
r
anch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hama
n
o
g
i
t-merge: squelch needle
s
s
error messag
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Juni
o
C Hamano
Merge
commit
|
commitdiff
|
tree
2006-12-06
Junio
C
Hamano
M
e
rge branch 'm
a
int
'
commit
|
commitdiff
|
tree
2006-12-06
Junio
C
Hamano
git
-
res
e
t to remove "$GIT_DIR/MERGE_M
S
G"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio C Haman
o
r
ead-tree:
d
ocument --excl
u
d
e
-per-dir
e
ctory
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Ju
n
i
o C Ha
m
ano
Lo
o
sen
"w
o
r
king
file will be lost" check in Porcelain-ish
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
J
uni
o
C Hamano
read-tree: f
u
rther loosen "w
o
rking file will be los
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-05
Juni
o
C Ham
a
n
o
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2006-12-04
J
u
n
io C Ha
m
a
no
unpack-tre
e
s: m
a
ke sur
e
"df_conflict_entry
.
name"
i
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
J
unio C H
a
mano
receive-
p
a
c
k:
d
o no
t
insist on fast-forward out
s
ide
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Junio
C Hamano
merge-re
c
ursive:
u
se xd
l
_mer
g
e()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
J
u
nio C Hamano
x
m
erge
:
ma
k
e
return value from xdl
_
m
e
r
ge() m
o
re usabl
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Juni
o
C Haman
o
M
erge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2006-12-03
Juni
o
C Hamano
git-merge: fix con
f
usion
between tag and bra
n
ch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Juni
o
C Ham
a
no
Merge master
.
kernel
.
org:/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2006-11-29
Junio C Ha
m
ano
Merge
branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2006-11-29
Junio C
H
amano
tut
o
rial: talk
about
user
.
name early a
n
d don't start
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
J
u
nio C Hama
n
o
Merge b
r
anch 'j
c
/
globfetch'
commit
|
commitdiff
|
tree
2006-11-29
Junio C Ha
m
a
n
o
M
erge
b
r
a
n
ch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2006-11-29
Junio C H
a
mano
gi
t
blame -
C
:
f
ix out
p
ut format tweaks when c
r
ossing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Junio C Haman
o
c
vsimpor
t
: style fixup
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
J
u
nio C Hamano
Merge branch 'js/shortlog'
commit
|
commitdiff
|
tree
2006-11-27
Jun
i
o
C Ha
m
ano
M
erge br
a
nch 'jc/push-del
e
te-ref'
commit
|
commitdiff
|
tree
2006-11-27
J
unio C Ham
a
no
Merge
b
r
anch 'jc/merge'
commit
|
commitdiff
|
tree
2006-11-27
Junio
C
H
a
mano
git-merge
:
do
not
l
e
a
k re
v
-pa
r
se output used
for ch
e
cking
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
J
u
nio C Hamano
git-merge: tighten error che
c
king
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Junio C Hamano
M
e
rge branch 'jc/pack-peeled'
commit
|
commitdiff
|
tree
2006-11-26
Junio C Hamano
grep: do not sk
i
p unmer
g
e
d e
n
tries when grepp
i
ng
i
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-26
Jun
i
o C Haman
o
Me
r
g
e branch
'
j
n/web'
commit
|
commitdiff
|
tree
2006-11-25
Ju
n
i
o C Hama
n
o
fetch-pack: do not ba
r
f w
h
e
n
duplicate re patte
r
ns
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Junio C Hamano
git-f
e
tch: allow forcing glob pattern in re
f
spec
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Junio
C
Hama
n
o
Merge branch 'master' into jc/globfe
t
ch
commit
|
commitdiff
|
tree
2006-11-25
Junio C Hamano
git-fetch: exit with
n
on-
z
ero
s
tatus
w
hen f
a
s
t
-forw
a
r
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Junio C
H
a
m
a
n
o
g
it-commit: s
h
ow
--summary after su
c
c
essf
u
l c
o
mmit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
J
u
nio C Ham
a
no
git-s
h
ortlog:
make c
o
mmon re
p
osi
t
ory prefix configurable
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Jun
i
o C Hamano
git
-
shortlog: fix comm
o
n
r
eposit
o
ry pr
e
fix abbreviati
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Junio
C
Hamano
git-branch -D: make i
t
work ev
e
n when on a yet-
t
o-be
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Juni
o
C Hamano
g
i
t-c
l
one: stop dumb
p
r
o
tocol from copying re
f
s outs
i
de
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Juni
o
C Ham
a
no
git
w
eb: (style) use chom
p
without
parenthes
e
s consis
t
ently
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Junio C H
a
mano
Allow git push to del
e
te remote re
f
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hama
n
o
M
erge branch 'jn/web'
commit
|
commitdiff
|
tree
2006-11-24
Junio
C
Hamano
Merge bran
c
h 'pb/diffroot'
commit
|
commitdiff
|
tree
2006-11-24
Junio C H
a
m
ano
Merge
branch 'j
c
/pack-h
e
uristics'
commit
|
commitdiff
|
tree
2006-11-24
Junio C Ha
m
ano
Merge
branch 'jc/
n
umstat'
commit
|
commitdiff
|
tree
2006-11-24
Junio C H
a
mano
Me
r
ge branch 'ap/branch-r
e
f-disp
l
ay'
commit
|
commitdiff
|
tree
2006-11-24
Ju
n
io C Hamano
M
e
rge branch
'
ap/
p
r
u
n
e
'
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
Typ
e
f
ix builtin-prune
.
c
::pru
n
e_object
(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Jun
i
o C
Hamano
Merge branch 'jc/u
p
load-pack'
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
r
e
fs outside refs/{he
a
ds,tag
s
} mat
c
h less
s
t
r
ong
l
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
gi
t
-f
e
tch: all
o
w glob p
a
ttern in re
f
spec
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
J
unio
C
Haman
o
git-f
e
tch: fix dumb protocol transport t
o
fetch from
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Ham
a
no
git-fetch:
r
euse ls-remo
t
e resul
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
Junio C
Hamano
trust-e
x
e
cutab
l
e-
b
it
:
fix brea
k
age f
o
r symli
n
ks
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-22
Junio C Hamano
S
tore
pee
l
ed re
f
s in packed-r
e
fs
(
take 2)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-22
Ju
n
io C Hamano
merge: a
l
low merging into a yet-to-
b
e-b
o
rn branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next