repo.or.cz
/
tgit.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
Juni
o
C
H
a
mano
Fix check_file_direct
o
ry
_
co
n
f
lic
t
()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Juni
o
C Haman
o
g
it-add: remove conflicting entry w
h
e
n
adding
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
J
unio C
Ha
m
ano
update-index: make D/F conf
l
i
c
t
error a bit more verbose
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Hamano
m
e
rge: give a bit pre
t
tier
m
erge me
s
s
age to
"merge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Johannes
Schindelin
D
o
cum
e
nt git-merge-file
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Quy T
o
n
t
hat
git-clo
n
e docum
e
ntati
o
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Andy P
a
rkins
git-status alwa
y
s says w
h
at bra
n
ch
it's
on
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
S
h
awn O
.
Pearce
Align se
c
tion headers of
'
gi
t
st
a
tus
'
to new 'git add'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Shawn O
.
Pe
a
rce
S
uggest use of "
g
i
t add file1
file
2
"
when ther
e
is
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Brian Gernhar
d
t
Make git-diff documentat
i
on use [--] whe
n
i
t
s
h
ould
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Brian
Gernh
a
rdt
Add
-
-add option
t
o git-repo-co
n
fig
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Shaw
n
O
.
Pearce
Teach
bash the
n
ew feature
s
of 'git show'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Lube
n
Tuikov
Exp
o
rt
PERL
_
PATH
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Shaw
n
O
.
Pear
c
e
E
nable re
f
logs
b
y default in any r
e
pository with a
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Shawn O
.
Pe
a
rce
Prov
i
de more mea
n
ingful output from 'git init-db'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
N
icolas Pitre
make commit messa
g
e a lit
t
le more cons
i
stent and confo
r
t
i
ng
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Shawn
O
.
Pearce
A
voi
d
access
i
ng a s
l
ow working
copy
during d
i
f
f
core
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Ham
a
n
o
M
erge br
a
nc
h
'js/s
h
ow
'
commit
|
commitdiff
|
tree
2006-12-14
Jo
h
annes Schin
d
e
li
n
git
-
show: grok blobs, trees and tag
s
, to
o
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-14
Junio C H
a
m
ano
git-reset
[
--mixed] <tree> [--] <paths>
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-14
Ju
n
io C
Hamano
g
i
t-reset: m
a
ke it w
o
rk
from withi
n
a s
u
bdi
r
ectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-14
J
unio C Hamano
g
i
t-fetch
:
make it work from
within a s
u
bdi
r
ec
t
ory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-14
J
o
hannes Sch
i
nd
e
lin
I
NSTALL: no need to have
GNU diff
i
n
s
talled
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-14
Junio C Hamano
Merge b
r
a
n
c
h
'
maint'
commit
|
commitdiff
|
tree
2006-12-14
Shawn
O
.
P
earce
Bypass
e
xpensive conte
n
t
comparsion during rename detect
i
on
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-14
Junio C
H
am
a
no
Update git-diff documentation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-14
J
u
n
io
C
Hama
n
o
Merge
branch 'jc/diff--cached'
commit
|
commitdiff
|
tree
2006-12-13
J
unio C Hamano
git-svn: allow
both
dif
f
.
colo
r
and color
.
dif
f
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Nicolas Pit
r
e
repacke
d
packs should be rea
d
-only
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hama
n
o
config d
o
c
umentation: group color
items together
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
E
r
ic
Wong
git-svn: correctly han
d
le
"(no autho
r
)" when
u
sing
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio C
Hamano
Merge b
r
anch 'j
c
/re
a
d-tree-
i
gnore'
commit
|
commitdiff
|
tree
2006-12-13
Junio
C Hamano
M
erge branch
'ew/re
r
ere'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Me
r
ge branch 'np/addcommit'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge
bra
n
ch 'lh/branch-rename'
commit
|
commitdiff
|
tree
2006-12-13
Junio
C Haman
o
Merge bran
c
h 'jc/commit-c
a
r
eful'
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C Ham
a
no
M
erg
e
branch 'a
p
/clone-o
r
igin'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hama
n
o
Merg
e
br
a
nch 'jc/numstat'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hama
n
o
Merge branc
h
'rr
/
cvsexportcommit'
commit
|
commitdiff
|
tree
2006-12-13
Junio
C Hamano
Merge
b
ranch 'ap/b
r
anch'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Ha
m
ano
branch --co
l
or: change defau
l
t
color s
e
lection
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio C H
a
mano
Merge br
a
nch '
j
s/merge'
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio C Hamano
s
e
nd-pack: t
i
ghten checks
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
Junio
C Ha
m
ano
spurious
.
s
p in manpa
g
es
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Haman
o
git merge: reword fail
u
re me
s
sage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Shawn Pearce
Remove
u
nconte
s
ted ren
a
m
ed files during m
e
rg
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio
C H
a
m
ano
Revert "
g
it-diff:
Intro
d
u
c
e --index and depre
c
ate
.
.
.
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hama
n
o
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2006-12-13
Eric Wong
git-svn
:
correctly
d
isplay fatal() error
me
s
s
a
ges
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Eric Wong
git-sv
n
:
e
xi
t
with stat
u
s 1
f
o
r test
f
ail
u
re
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Andy Park
i
ns
Allow subcommand
.
c
olor an
d
color
.
subco
m
man
d
color con
f
igur
a
tion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o
C
H
amano
git-
p
ush:
d
ocument removal
of
r
emote r
e
f with
:<dst
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Joha
n
nes Sch
i
ndelin
m
erge-recursive: add/add really i
s
modi
f
y/modify with
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C Ha
m
ano
Merge branch '
m
a
s
ter' into
j
s/m
e
rge
commit
|
commitdiff
|
tree
2006-12-13
J
o
han
n
es Schinde
l
in
Get rid of t
h
e dependency on RCS' merge
p
rogra
m
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Eric
Wo
n
g
git-svn:
c
orrectly han
d
le packed-refs in refs/remotes/
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Me
r
ge
branch 'm
a
int'
commit
|
commitdiff
|
tree
2006-12-13
Junio
C
Hamano
add test
c
ase for recursive merge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Eric Wong
git-svn: correctly display fat
a
l() error mess
a
ges
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Eric
W
ong
g
i
t-svn: allo
w
dcommit to take
an alternate
h
ead
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
E
r
ic W
o
ng
g
i
t
-
s
v
n: enable l
o
gging
o
f information
not s
u
pported
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Alex Ries
e
n
Clarify fetch erro
r
for missing
objects
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-12
Brian Gernhar
d
t
Move Fink and
Ports chec
k
to afte
r
config file
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-12
Andy
P
arkins
Colourise git-branch outp
u
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Ha
m
ano
diff --n
u
mstat: show
binary with '-' to
match "ap
p
l
y
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
Robin Rosenberg
Mak
e
cvsexportcommit wor
k
w
i
th fil
e
names with s
p
ace
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Hamano
shor
t
l
og: fi
x
segfaul
t
on
e
mpty authorname
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Haman
o
short
l
og: remove "[PATCH
]
" prefix fro
m
shortlog output
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
Junio C H
a
mano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2006-12-11
Shawn O
.
Pea
r
ce
Ma
k
e
s
ure
t
he empty tree exists when neede
d
in merge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
J
im
M
ey
e
ring
Don't use memcpy when source a
n
d dest
.
buffer
s
may
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
C
hris W
r
ight
no need
to install manpages as ex
e
cutable
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-10
Junio C
Hamano
git-commit: allow
-
-
o
n
ly to lose
w
hat wa
s
st
a
ged earlier
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-10
Ju
n
io C Ham
a
no
Documentation
/
g
it-commit: re
w
rite to make it mo
r
e end
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-09
Eric Won
g
r
e
rere: record (or
avoid misreco
r
ding) res
o
lved, skipped
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-09
J
u
n
io C
Hama
n
o
git-re
r
e
r
e
: a
d
d 'gc' com
m
and
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-09
Eric Wong
rerere: add clear, di
f
f, and
status
c
omm
a
nds
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-09
J
.
Bruce Fields
Documentation: si
m
pler s
h
a
r
e
d
r
e
pository cr
e
ation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-09
Jeff King
shortlog
:
fix segf
a
ult
o
n empty a
u
thornam
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-09
J
osef Weidendorfe
r
Add branch
.
*
.
merge warnin
g
and documen
t
ation update
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-08
J
u
nio
C Hamano
F
i
x
perl/
bu
i
ld
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-08
E
ric Wong
git-
s
vn:
u
se do_
s
witch fo
r
--foll
o
w-parent if the
SVN
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-08
Uwe Ze
i
sberge
r
Fi
x
docu
m
entation copy&pas
t
e t
y
p
o
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-08
Eric Wong
g
i
t-svn: extra error che
c
k
to
ensure we open a
file
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-08
J
.
Bruce Field
s
Documentation: update git-cl
o
ne man page wit
h
new b
e
havior
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-07
Junio
C Hamano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2006-12-07
Mar
t
in La
n
g
h
o
f
f
cv
s
serve
r
:
Avoid
misc
o
unting bytes in
Perl
v5
.
8
.
x
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-07
N
ico
l
as P
i
tr
e
chan
g
e
the unpack l
i
m
i
t
tr
e
sh
o
ld to a saner v
a
lue
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-07
J
.
Bruce
Fields
Documentation: reorga
n
ize
c
vs-mi
g
r
a
tion
.
txt
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Andy P
a
r
k
in
s
Expl
i
c
i
tly add the d
e
fault "git pu
l
l" behavio
u
r to
.
.
.
commit
|
commitdiff
|
tree
2006-12-06
Ju
n
io C
H
amano
git-merge: fix
"
fix
c
onfusion
b
etwe
e
n tag and br
a
nch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Eri
c
Wong
g
i
t-svn: avoid network timeout
s
for long-ru
n
ning fetches
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Jakub
N
a
r
ebski
gitweb: Allow PNG, GIF, JPEG im
a
ges t
o
be displayed
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hamano
git-merge:
s
quelch n
e
edless er
r
or
messag
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Junio
C Hama
n
o
M
e
rg
e
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hamano
M
erge
br
a
n
ch 'mai
n
t'
commit
|
commitdiff
|
tree
2006-12-06
Jun
i
o C
H
amano
git-reset
to r
e
move "$GIT_DIR/ME
R
GE_MSG"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Joh
a
nnes Sch
i
n
d
e
l
in
merg
e
-f
i
le:
s
up
p
ort -p an
d
-q; fix comp
i
le warnings
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Joh
a
nne
s
Schindelin
Add builtin m
e
rge-file, a
m
inimal rep
l
acement
for RCS
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next