repo.or.cz
/
git
/
kusma.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
Eric Wong
git-cv
s
s
erver:
f
ix breakage
whe
n
call
i
ng git merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C Hamano
rerer
e
: fix brea
k
age of r
e
solving
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Aneesh Kumar K
.
V
Add
co
n
f
ig example with respec
t
to bra
n
c
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Brian G
e
rnhardt
Add documentation
f
o
r show-br
a
nch --topics
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Ni
c
ola
s
P
i
tre
ma
k
e git a bit less
c
ryptic on fetch errors
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
N
i
col
a
s Pitre
ma
k
e patch_delta
(
)
error cases a bit m
o
re verbose
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
racy-
g
i
t
: doc
u
mentation upda
t
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Juni
o
C
H
amano
show-ref: fix
-
-
e
x
c
lude-existi
n
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
parse-r
e
m
o
te:
:
expand_r
e
fs
_
wild
c
ard()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Jeff Ki
n
g
v
i
m
s
y
n
tax
:
follow recent cha
n
g
es to
com
m
it template
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Ju
n
io
C
H
a
mano
show-r
e
f: fix --verify --h
a
sh=length
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C
H
a
mano
s
how-ref: fix --quiet --veri
f
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
J
u
nio
C
Hamano
Merge br
a
nch 'jc/blam
e
-b
o
un
d
ar
y
'
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hama
n
o
Merge b
r
anch 'jc/reflog'
(ea
r
ly pa
r
t)
commit
|
commitdiff
|
tree
2006-12-18
Junio C Ha
m
ano
Merge branch 'js/branch-confi
g
'
commit
|
commitdiff
|
tree
2006-12-18
J
unio C Hamano
Merge branch 'jn/web
'
(early part)
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
a
v
oid ac
c
essing _
a
ll_ loose
refs
i
n git-
s
how
-
ref -
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
J
u
n
i
o C Hama
n
o
g
it-
f
etch: Avoid re
a
ding
pa
c
ked
r
efs over and o
v
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
Teach
show-branch how to show ref
-
l
o
g data
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Juni
o
C Hamano
m
a
rku
p
fix in svni
m
por
t
documentatio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Qu
y
T
ont
h
at
D
ocumentation:
n
ew
option -P for
git-sv
n
i
mport
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Jun
i
o C Hamano
Fix mis-
m
ark
-
up in g
i
t-merge-file
.
txt
docum
e
n
t
a
t
i
on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Shawn O
.
Pearce
Defau
l
t
GIT_COMMITTER
_
NAME to logi
n
name
i
n reciev
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
F
i
x c
h
e
c
k
_file_directory
_
c
o
nflict()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C
H
amano
gi
t
-a
d
d
:
remove conf
l
i
c
ting e
n
tr
y
when adding
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C
H
amano
u
pdate
-
index:
m
ake
D
/F conflict error a bi
t
more v
e
rbose
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Johannes S
c
hindelin
g
i
t-branch: rename config var
s
branc
h
.
<branch>
.
*, too
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Johan
n
es Schindeli
n
add a functio
n
t
o re
n
ame sections in
the
c
o
n
fig
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
J
unio C Hama
n
o
m
e
rge:
gi
v
e a bit pretti
e
r merge
m
essa
g
e
to "merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Jakub Narebski
gitweb:
Add "n
e
xt"
l
i
nk
t
o comm
i
t
view
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Jakub Narebski
gitweb: Add title attribute to re
f
marker
w
i
th full
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Jakub
N
a
rebski
gitweb:
Do not sho
w
difftree for merges in "commit
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Johannes Schindelin
Do
c
u
ment gi
t
-m
e
rge-fi
l
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Quy Tontha
t
git-clone do
c
u
mentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
And
y
Parkins
git-status always says w
h
at
b
ranch it's on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Shawn O
.
Pearce
Ali
g
n se
c
tion h
e
aders of 'git
s
tatus' to new
'git add'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Shawn O
.
Pea
r
ce
Suggest use
of "git add f
i
l
e
1 file2" when there
i
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
B
rian Gernhardt
Make git-diff documentation use [--] whe
n
it should
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Brian Ge
r
nhardt
Ad
d
--add
o
p
ti
o
n to gi
t
-repo-c
o
nf
i
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Shawn
O
.
Pearce
Te
a
ch bash the new fe
a
tur
e
s
of 'g
i
t
sh
o
w'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Luben Tu
i
kov
E
xport PE
R
L
_PAT
H
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Shawn
O
.
Pearce
Enable r
e
flogs
b
y
d
e
f
a
ult in any
repository with a
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Shawn O
.
Pea
r
ce
Provide more mean
i
ngful output fro
m
'git init-db'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Nic
o
las Pitre
ma
k
e
co
m
mit message a litt
l
e mo
r
e
c
onsistent and conf
o
rting
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Shawn O
.
Pearce
Avo
i
d acc
e
ssing a s
l
ow working
copy during
d
i
ffcore
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Juni
o
C Hamano
Me
r
ge br
a
n
c
h '
j
s/sh
o
w'
commit
|
commitdiff
|
tree
2006-12-14
Joh
a
nne
s
Schi
n
delin
git-s
h
ow: grok blobs, t
r
ees and tags, too
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
J
u
nio C Hamano
g
it-reset [--mixed]
<
tree> [--] <pa
t
hs>
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Jun
i
o C Hama
n
o
git-r
e
s
e
t: ma
k
e it work
from within a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio C
Ha
m
ano
git-fe
t
c
h
:
m
ake it wo
r
k f
r
om withi
n
a
s
ubdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
J
ohannes Schindeli
n
INSTA
L
L:
no need
t
o have GNU
d
iff installed
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
J
u
nio C
H
amano
Merge bra
n
c
h
'maint'
commit
|
commitdiff
|
tree
2006-12-14
Shawn O
.
Pearce
Bypa
s
s expensive
content comparsion duri
n
g ren
a
m
e detection
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
J
u
nio C Hamano
Update
gi
t
-
d
i
ff doc
u
m
entation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio C Hamano
Merge branch 'j
c
/diff--c
a
c
h
ed'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
git-s
v
n: allow both diff
.
color a
n
d color
.
diff
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Nicolas Pitre
repacked pack
s
s
houl
d
be read
-
only
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
config documen
t
ation: gro
u
p color items
t
oget
h
e
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Eric Wong
git-svn:
correctly handle "(no
a
ut
h
o
r
)" w
h
en using
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
git-
b
lame:
sh
o
w
l
ines
a
ttrib
u
ted
t
o
boundary
c
ommits
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C
H
amano
Merge br
a
nch 'jc/r
e
ad-tree-ignore'
commit
|
commitdiff
|
tree
2006-12-13
Junio C
H
amano
M
e
rge br
a
nc
h
'ew/rerere'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge b
r
a
n
c
h 'np/addcommi
t
'
commit
|
commitdiff
|
tree
2006-12-13
Junio C
H
amano
Merge branch 'lh/branch-rename
'
commit
|
commitdiff
|
tree
2006-12-13
Junio
C
Ham
a
no
M
e
rge bra
n
ch 'j
c
/
c
ommit-careful'
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C Hama
n
o
M
e
rge branch
'
ap/clone-
o
rigin'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merg
e
branch '
j
c/numstat'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Ha
m
ano
Merge
b
ranch '
r
r/cvse
x
p
o
r
tco
m
mit'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Ha
m
ano
Merge
branch 'ap/
b
ranch'
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o
C
Hama
n
o
b
ran
c
h --color: cha
n
ge
default
color sele
c
tion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Ju
n
io C
H
amano
Merge
b
ranch 'js/merge'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
se
n
d-pack: tighten checks for remote names
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
unio C
H
amano
git-
p
ush
:
accept
tag
<
tag
>
as advertised
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
unio C Ham
a
no
spu
r
iou
s
.
s
p in man
p
ages
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
g
it merge: r
e
word
fail
u
re message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Shawn Pearce
Remove uncontes
t
ed renamed
f
iles durin
g
mer
g
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
unio
C Hamano
Re
v
ert "git-
d
i
ff:
Introduce --inde
x
and deprecate
.
.
.
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C H
a
m
a
n
o
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2006-12-13
Eric
W
ong
git-svn:
c
orrectly d
i
sp
l
a
y
f
a
tal(
)
error messages
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Eric Wong
gi
t
-svn:
e
xit wi
t
h status 1 for
test
f
a
ilures
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Andy P
a
rkins
Allow sub
c
ommand
.
color
and
c
olo
r
.
subcommand
c
olo
r
configurat
i
on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C Hamano
git-push: document removal of
remote ref w
i
th :<dst
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Johannes Schindelin
merge-recur
s
ive: add
/
add really is
modif
y
/modify with
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
M
erge br
a
nch 'master' into
js/me
r
g
e
commit
|
commitdiff
|
tree
2006-12-13
Johanne
s
S
chindelin
Ge
t
rid of th
e
d
e
pen
d
ency on
RCS' merge program
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Eric Wong
git-svn: correctly
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
M
e
rge bra
n
c
h
'ma
i
nt'
commit
|
commitdiff
|
tree
2006-12-13
Junio C
H
amano
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: corre
c
tly display fata
l
(
) error messa
g
es
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Eric Wong
git-svn: al
l
ow dcommit to ta
k
e
an alterna
t
e head
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Eric Wong
git
-
svn: enable
logging of inform
a
ti
o
n not supporte
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Alex Riesen
Clarify
f
et
c
h
e
rror for missi
n
g obj
e
cts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-12
B
rian
Gernhard
t
Move Fink
a
nd Ports check to af
t
e
r con
f
i
g
file
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-12
Andy Parkins
Colourise
git-
b
ranch
output
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-12
Ja
k
u
b Narebski
gi
t
w
e
b
:
SHA
-
1 in c
o
m
mit log message links
to "object
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-12
Jakub Nareb
s
ki
gitweb: H
y
pe
r
link target of sym
b
olic link in "
t
ree
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-12
Jakub Nar
e
bski
g
i
tweb: A
d
d g
e
neric git_obje
c
t subrout
i
ne
t
o display
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-12
Jakub Narebski
git
w
eb:
Show
targe
t
of
symbolic l
i
nk in "
t
r
e
e" view
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-12
Jakub Narebski
g
itweb:
Don't use
C
o
n
tent
-
E
ncoding:
he
a
der in g
i
t
_
snapshot
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C H
a
mano
d
i
ff --numstat: show binary with '-' to m
a
tch "apply
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next