repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Allow branch.*.merge to talk about remote tracking branches.
2006-12-17
Junio C Hamano
Fix check_
f
ile_d
i
r
e
ctory
_
c
onfl
i
c
t
(
)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C H
a
mano
git-ad
d
:
remove conf
l
ic
t
ing
entry w
h
en adding
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Juni
o
C
H
amano
updat
e
-index: make D/F conflict error a bit more ve
r
bose
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Johannes Sc
h
i
ndelin
git-branch: rename c
o
nfig vars branch
.
<branch>
.
*
,
to
o
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Johannes S
c
h
i
ndelin
ad
d
a
f
u
n
ction to
rename s
e
ctions in the config
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Hamano
git-clone:
l
ose the traditio
n
al 'no-se
p
arate-
r
e
m
ote
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Hamano
git-clone:
l
ose th
e
artifici
a
l "first" fetch
refspec
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Hamano
git-
p
u
ll:
r
efuse defaul
t
me
r
ge without branch
.
*
.
merg
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio
C Hamano
git-clone: use wildcard specification for trac
k
ing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C
Hamano
me
r
ge:
give a bit pret
t
ier merge message to
"
merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
J
ak
u
b
Narebski
gitweb: Add "next" li
n
k
to
c
ommit view
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
J
a
kub Narebski
g
i
t
w
eb: A
d
d title att
r
ibute to ref ma
r
ker with ful
l
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Jakub Narebski
gitweb: Do not
s
h
o
w
difft
r
ee for merges
i
n "commit
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Er
i
c Wo
n
g
git-svn:
r
ename 'commit
'
command to 'set-tree'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
E
r
ic
W
ong
git
-
svn: remove su
p
port for
t
h
e s
v
n command-line client
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Jo
h
annes Schindelin
Docume
n
t g
i
t-merge-file
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Quy Tonthat
git-clone documentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
And
y
Park
i
ns
git-status always sa
y
s wh
a
t bran
c
h it's on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Eric Wong
git-s
v
n: conv
e
rt
to
using Git
.
pm
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Shawn O
.
Pea
r
ce
A
l
i
gn section
headers
of 'git s
t
atus'
t
o new 'git add'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Shawn O
.
P
ear
c
e
Suggest
use of "git add fi
l
e1 file2" when there is
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Brian Gernhardt
Make
g
it-diff doc
u
m
e
n
tation use [--] when it should
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Br
i
an G
e
rnhardt
Add --add o
p
t
i
on to gi
t
-repo-c
o
nfig
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Shawn O
.
Pearce
Teach bash th
e
n
ew features o
f
'git s
h
ow'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Luben Tuikov
Export PERL_PATH
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
S
h
a
wn O
.
Pea
r
ce
Enable reflo
g
s by default
i
n any repos
i
tory with a
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Sh
a
wn
O
.
Pearce
Pr
o
vide more meaningful
o
utput from 'git init-db'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Nic
o
la
s
Pitre
m
a
k
e
commit mes
s
age a
little
more consistent a
n
d confortin
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Shawn
O
.
Pearce
Avoid accessing a slow
w
orkin
g
copy durin
g
dif
f
c
ore
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio
C
Hamano
M
e
rge bra
n
ch 'js/show'
commit
|
commitdiff
|
tree
2006-12-14
Johannes Schindelin
git-sho
w
: grok b
l
obs, trees and
t
ags, too
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio C Hamano
g
it-reset [--mixed] <tree> [--] <paths>
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Ju
n
i
o
C Hamano
gi
t
-reset: make it work fro
m
within a subdire
c
tory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Juni
o
C Hamano
git-fetc
h
: mak
e
it work from within a su
b
directory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
J
ohannes Schin
d
elin
INSTALL: no need to have GN
U
diff in
s
talled
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Ju
n
io C Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2006-12-14
Shawn O
.
Pearce
Bypas
s
e
x
pensive content compars
i
o
n during rename dete
c
ti
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio
C
Hamano
Update
g
it-diff documentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Jun
i
o C Hamano
Merge branch 'j
c
/diff--
c
a
c
hed'
commit
|
commitdiff
|
tree
2006-12-13
J
u
ni
o
C Hama
n
o
g
i
t
-svn:
a
l
low bot
h
diff
.
color and color
.
d
iff
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
N
i
colas
P
i
tre
re
p
acked packs should be read-only
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio
C Hamano
confi
g
docume
n
tation: g
r
oup col
o
r
items
t
ogether
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Eric Wong
git-svn:
c
orrectly handl
e
"(no
a
uthor
)
" when using
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
git
-
b
l
ame: s
h
ow lines attribu
t
ed to boundary commits
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Ham
a
no
Mer
g
e b
r
a
n
c
h 'jc
/
read-tree-ignore'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge bra
n
ch '
e
w
/
rerere'
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o
C Hamano
Merge br
a
nch 'np/addcommit'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Mer
g
e
br
a
nch 'lh/br
a
n
ch
-
re
n
ame'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge
br
a
nch 'jc/commi
t
-c
a
reful'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Mer
g
e branch 'ap
/
clone-origin'
commit
|
commitdiff
|
tree
2006-12-13
Junio
C
Hamano
Merge branch 'jc/numstat'
commit
|
commitdiff
|
tree
2006-12-13
Ju
n
io C Ham
a
n
o
Merge branch 'rr
/
cvsexportcommit'
commit
|
commitdiff
|
tree
2006-12-13
Ju
n
i
o
C
Ha
m
ano
Mer
g
e
b
ran
c
h
'ap/branch'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
branch --co
l
or: ch
a
nge defaul
t
co
l
or
s
e
lection
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C
H
amano
Merge
b
ran
c
h
'
j
s
/merge'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Ha
m
an
o
send-pack: tighte
n
c
h
ecks for remote
n
a
m
es
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C Hamano
git-push: ac
c
ept tag <tag> as a
d
v
e
rtised
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
spu
r
ious
.
s
p
in m
a
npages
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C Hama
n
o
git merge: reword failure message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Shawn Pea
r
ce
Remo
v
e unc
o
ntested renamed files during
merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio
C Hama
n
o
R
ev
e
rt
"
git-diff: Int
r
oduce
--i
n
d
ex and
d
epreca
t
e
.
.
.
commit
|
commitdiff
|
tree
2006-12-13
Junio C
Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-13
Eric Wong
git
-
svn: c
o
rrect
l
y di
s
play
f
atal()
error messages
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Eric Wong
g
i
t-svn: exit w
i
th status 1 f
o
r test
f
ailures
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Andy
P
a
rk
i
ns
Allow subcomm
a
nd
.
color and co
l
or
.
subcomman
d
color conf
i
guration
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C
Hamano
gi
t
-pu
s
h: d
o
cument remova
l
of remote
ref with :<dst
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Johan
n
es
S
chin
d
elin
merge-recursive:
a
dd
/
a
d
d r
e
all
y
is modify/modify with
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge branch 'mast
e
r' into js/merge
commit
|
commitdiff
|
tree
2006-12-13
Johannes Sch
i
nd
e
lin
G
et
rid of t
h
e
d
epende
n
cy o
n
RCS' merge program
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Eric Wong
git-
s
vn: correctly
h
andle pa
c
ked-refs i
n
refs/remote
s
/
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Ha
m
a
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
add test
c
a
se for r
e
cursive merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Eric W
o
ng
gi
t
-
svn: correc
t
ly display f
a
tal(
)
e
rror messages
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Eric Won
g
git-svn: allow dcommit to take an
a
l
t
e
r
n
at
e
h
ead
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
E
r
ic Wo
n
g
git-s
v
n: e
n
a
ble l
o
gging
of inform
a
t
i
on
n
ot su
p
ported
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Alex Ri
e
s
e
n
C
l
arify fetch error for missin
g
objects
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-12
B
r
ian Gernhardt
Move Fink and Ports che
c
k to
a
fte
r
con
f
ig file
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-12
And
y
Parki
n
s
Colourise g
i
t-branch output
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-12
Jakub Nare
b
ski
g
itweb:
S
HA-1 i
n
comm
i
t
l
og mes
s
a
g
e l
i
nks
t
o "o
b
ject
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-12
Jakub
N
arebski
gitw
e
b
:
Hy
p
erlink target of symbolic lin
k
in "tr
e
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-12
J
a
kub Narebski
git
w
eb: Add g
e
n
e
r
ic gi
t
_o
b
j
e
c
t sub
r
o
u
ti
n
e to dis
p
l
a
y
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-12
Jakub Na
r
eb
s
ki
gitwe
b
: Show target
o
f symbolic link in "tr
e
e" view
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-12
Jakub Narebski
gitweb: Don't u
s
e C
o
ntent
-
E
n
coding:
h
eader
i
n
gi
t
_
snapshot
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Juni
o
C Hamano
d
iff --n
u
mstat: sh
o
w binary
with '-' to
m
a
tch "apply
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Robi
n
Rosenb
e
rg
Make cvsexportcommit work w
i
th filenames w
i
th spa
c
es
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C
Hamano
shortlog: fix segfault o
n
empty authorname
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C
H
ama
n
o
shortlog: remove "[PATCH]" p
r
efix from shortlog output
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Hamano
Mer
g
e b
r
anch 'm
a
int'
commit
|
commitdiff
|
tree
2006-12-11
S
hawn O
.
Pearc
e
Mak
e
s
u
r
e the empty tree exi
s
ts whe
n
nee
d
ed in
m
e
r
g
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
J
im Me
y
e
r
ing
Don't use me
m
c
p
y when s
o
urce and dest
.
buffe
r
s
may
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Chris Wright
n
o
nee
d
to in
s
t
a
ll manp
a
ge
s
as executable
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-10
Junio C Ham
a
no
gi
t
-
commit: allow --only t
o
lose wha
t
wa
s
s
taged ea
r
lier
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-10
Junio C
Haman
o
Do
c
ument
a
tion/
g
it
-
commit:
r
ewrite to mak
e
it
more
end
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-09
Eri
c
Wong
r
e
re
r
e: record (or avoid m
i
srecording) resolved, skipped
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-09
Ju
n
io C
Hamano
git-
r
erere:
a
dd 'gc' com
m
and
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-09
Eric Wong
rerere: add
c
lear,
diff, and
stat
u
s commands
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-09
J
.
Bruce Fields
Documentati
o
n:
s
impler s
h
ared rep
o
sito
r
y creation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-09
J
e
ff
King
s
h
ortlog: fix segfa
u
lt on empty au
t
h
o
rname
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-09
J
o
s
ef
W
eid
e
n
dorfer
Add bran
c
h
.
*
.
merge warning
and documen
t
a
t
io
n
update
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
Junio
C
Ham
a
no
Fi
x
perl/ build
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next