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
git-cvsserver: fix breakage when calling git merge-file
2006-12-20
Er
i
c Wo
n
g
g
i
t-cvsserver: fix breakag
e
when ca
l
lin
g
gi
t
merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C Hamano
r
e
rere: fix breakage of re
s
olving
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Aneesh Kumar K
.
V
Add
c
onfig example with res
p
e
c
t to bra
n
ch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
B
r
i
an Gernhardt
Ad
d
documenta
t
ion fo
r
show-br
a
n
ch -
-
topics
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
N
i
colas
Pitre
make git
a bit less cryptic on fetch
e
rro
r
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Nico
l
as Pitre
make p
a
tch
_
delta() error cases a bit mo
r
e ver
b
ose
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Jun
i
o C Ham
a
no
racy-g
i
t: documentatio
n
upd
a
te
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C H
a
m
a
no
s
how-ref: fix --exclude-existing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Juni
o
C Hama
n
o
parse-remote::expand_refs_wildcard()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Jeff K
i
ng
vim syntax: follow recent changes
to
c
ommit te
m
plate
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio
C
Hamano
show-ref: f
i
x --verify --hash
=
le
n
gth
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Ha
m
a
n
o
show-ref: fi
x
--qu
i
et --verif
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
J
unio
C
H
a
mano
M
e
rg
e
branc
h
'jc/blame-bo
u
n
d
ar
y
'
commit
|
commitdiff
|
tree
2006-12-18
J
unio C Hamano
Mer
g
e bran
c
h 'jc/reflog
'
(early part)
commit
|
commitdiff
|
tree
2006-12-18
J
unio C Hamano
Merge branch
'
js/branch-co
n
fig'
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
Me
r
ge br
a
nch
'j
n
/web'
(early p
a
rt)
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
a
void accessing _all_ lo
o
se refs in git-show-
r
ef -
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio
C
Hamano
gi
t
-fetch: Avoid reading
p
acked refs o
v
e
r
and over
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
J
u
nio C Hamano
Teach sho
w
-branch how to s
h
ow re
f
-
l
og da
t
a
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Juni
o
C Hamano
markup fix in svnimpo
r
t document
a
tion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Quy
Tonthat
Documentat
i
o
n: new opt
i
on -P for gi
t
-svnimport
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
J
un
i
o
C
Hamano
F
i
x mis-mark-up in git
-
mer
g
e-file
.
txt d
o
c
u
mentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Shawn
O
.
Pearce
D
e
fault GIT_COMMITTER_NAME to l
o
gin name in
re
c
ieve
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
Fix ch
e
ck_file_directory_confli
c
t()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Ham
a
no
g
i
t-add: r
e
move conflicting ent
r
y when adding
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Ju
n
io C Ha
m
ano
update-
i
n
dex: make D/F conflict error a bit m
o
r
e verbose
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Jo
h
ann
e
s Schindelin
git-bran
c
h: rename c
o
nfig vars br
a
nch
.
<bra
n
ch>
.
*, to
o
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
J
o
han
n
es Schin
d
elin
add
a function to ren
a
me
s
e
ctions in the config
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Hamano
merge: give a bit p
r
ett
i
er
mer
g
e
me
s
sa
g
e
to
"merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Jakub Narebski
gitwe
b
: Add "next" link to commit view
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Jakub Narebski
gitweb: Add title attribu
t
e
t
o ref marker with
f
ull
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Jakub Na
r
ebski
gitweb: Do not show d
i
fftr
e
e fo
r
merges in "commi
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Johannes Sc
h
i
n
d
eli
n
Doc
u
ment git-merge-fil
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Quy Tonthat
gi
t
-c
l
one do
c
umen
t
a
tio
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Andy
P
arkins
gi
t
-status always says
what branch it's on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Shawn O
.
Pear
c
e
Align section headers of 'git
s
tatus' to new 'g
i
t add'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Shawn O
.
Pearce
Suggest use of
"gi
t
add file
1
file2" when there
i
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Brian
G
er
n
hardt
Make
git-diff documentation us
e
[--] when it
s
hould
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Brian
Gernhar
d
t
Add --add opti
o
n to g
i
t
-
r
epo-config
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Sh
a
wn O
.
Pearce
Teach bas
h
the
new fe
a
tures of 'git show'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Luben Tuikov
Export PER
L
_
P
ATH
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Shawn
O
.
Pearce
E
n
able reflogs by default i
n
any repository
with a
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Sha
w
n O
.
Pearce
P
r
o
v
ide m
o
re m
e
aningful output from 'git init-db'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Nicolas
Pitre
make
c
ommit mes
s
age a little more consistent
a
nd co
n
f
o
rti
n
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Sha
w
n
O
.
P
earce
Avo
i
d
accessing
a slow w
o
rking copy during diffcore
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio
C
Hamano
Merg
e
b
ranc
h
'js/show'
commit
|
commitdiff
|
tree
2006-12-14
Johannes
S
chindelin
git-show: gro
k
blobs,
t
rees an
d
tags
,
to
o
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio C Hamano
git-reset [--mixed] <tr
e
e
> [--] <paths>
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio C Hamano
git-res
e
t: make it
wo
r
k
f
rom
w
i
thin a subdirec
t
or
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
J
u
nio C Hamano
g
it-fet
c
h: mak
e
it work from
within a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Joha
n
nes
S
c
hind
e
lin
INSTALL:
no nee
d
to hav
e
GNU diff
i
n
stalled
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio
C
H
a
mano
Merge b
r
an
c
h 'maint'
commit
|
commitdiff
|
tree
2006-12-14
Shaw
n
O
.
P
e
a
rc
e
B
y
pass expen
s
i
v
e content comparsion durin
g
rename detection
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio
C
H
a
m
a
no
Upd
a
te git-
d
iff d
o
cumentatio
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio C Hamano
Me
r
ge branch 'j
c
/diff--cached'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
git-svn: allow both d
i
ff
.
color and color
.
diff
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Nico
l
as Pitre
repacked packs should
be rea
d
-on
l
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio
C
Hamano
confi
g
docum
e
ntation:
g
roup color items to
g
ether
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Eric Wo
n
g
g
it-svn: correctly
h
and
l
e
"
(no aut
h
o
r)
"
w
h
en using
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C Ha
m
ano
g
it-blame: sho
w
lines attributed to bo
u
ndary c
o
mmits
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio C
H
aman
o
M
er
g
e branch 'jc/read-tree-ignore'
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio C Hamano
Mer
g
e branch 'ew/rerere'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Ha
m
ano
Merge branch 'np/ad
d
co
m
mit'
commit
|
commitdiff
|
tree
2006-12-13
J
unio C Hamano
Merge
branc
h
'
l
h/branch-rename'
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio C Hamano
M
e
rge bran
c
h 'jc/co
m
mit-careful
'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge branch 'ap/clone-origin'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Ha
m
ano
Mer
g
e bra
n
ch 'jc/
n
umstat'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge b
r
anch
'
r
r
/cvsex
p
ortcommit'
commit
|
commitdiff
|
tree
2006-12-13
Junio C H
a
mano
Merge branch
'
ap/branch'
commit
|
commitdiff
|
tree
2006-12-13
Ju
n
io C Hamano
branch
--color:
change default
color selection
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Ju
n
io C Hamano
M
e
rge branc
h
'
js/merge'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
send-p
a
ck: tighten checks for remote
n
ames
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio C
H
amano
git-push:
accept tag <tag> as adver
t
is
e
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Haman
o
spurious
.
sp in manpages
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Ham
a
no
git merge: reword failure message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
S
h
awn Pearce
Remo
v
e uncontested rena
m
ed fi
l
es
d
uring mer
g
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C H
a
m
a
no
Rev
e
rt "git-di
f
f: In
t
roduce
--index and de
p
recate
.
.
.
commit
|
commitdiff
|
tree
2006-12-13
J
unio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-13
E
r
i
c Wong
git-s
v
n
:
correctly display fatal() error messa
g
es
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Eric Wo
n
g
git-svn: exit with status 1 for test failure
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
An
d
y Parkins
Allow subc
o
mmand
.
color and color
.
s
u
bcomm
a
nd c
o
lor configuration
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C
Hamano
g
i
t-push: d
o
c
u
ment removal of remo
t
e ref wit
h
:<ds
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Joh
a
nn
e
s Schindelin
merge-recurs
i
ve: ad
d
/
a
dd
r
eal
l
y is modify/modify with
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio
C Hamano
Merge br
a
nch 'master' into js
/
m
e
rge
commit
|
commitdiff
|
tree
2006-12-13
Johannes Sc
h
indelin
Get
r
i
d
of the dependency on RCS' mer
g
e
pr
o
gra
m
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Er
i
c Wong
git
-
svn:
c
orrec
t
ly ha
n
dle packed-refs in r
e
fs/remotes
/
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C H
a
m
ano
Me
r
g
e
b
ranch 'maint'
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C Hamano
ad
d
test cas
e
for
r
ecurs
i
ve me
r
ge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
E
ric Wong
git-svn:
correctly display fa
t
al() error message
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Eric Wong
git-s
v
n: allow dco
m
mit to take an a
l
ternate hea
d
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Eric Wo
n
g
git-svn
:
enable
logging of inform
a
tion not
s
u
p
p
o
rted
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Alex Riesen
Clar
i
fy fetch error for missing o
b
je
c
ts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-12
Bri
a
n
Gernhardt
Move Fink and
Por
t
s chec
k
to after config file
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-12
Andy Parkins
Colo
u
ris
e
git-branch output
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-12
Jak
u
b Narebski
gitweb: SH
A
-1 in commit l
o
g
messa
g
e
l
i
n
k
s
t
o
"
object
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-12
Jakub Narebski
g
itweb: Hyp
e
rlink
t
arget o
f
s
y
mbol
i
c link in "tree
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-12
Jakub
N
a
rebski
gitweb: Add generic git_
o
bjec
t
subrou
t
ine to
d
i
spl
a
y
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-12
Jakub Nare
b
s
ki
git
w
eb: Sh
o
w ta
r
get
of symbolic link
i
n "tree" view
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-12
Ja
k
u
b
Narebski
gi
t
web: Don't
u
s
e
Content
-
E
nc
o
ding
:
hea
d
e
r in git_sn
a
p
shot
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Hamano
d
iff --numst
a
t: show
b
i
n
ar
y
wi
t
h '-' to m
a
tch "apply
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next