repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Move "no merge candidate" warning into git-pull
2006-12-19
Josef We
i
den
d
o
r
fer
Move "no mer
g
e candidate" war
n
ing in
t
o git-pull
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
J
u
nio C Hamano
Use preprocessor
c
onstan
t
s for environment variable
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C Haman
o
D
o
n
o
t cre
a
t
e
$GIT_DI
R
/remo
t
es/ directory anym
o
re
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C Haman
o
Merge branch 'j
c
/tes
t
-clone' into
jc
/
clone
commit
|
commitdiff
|
tree
2006-12-19
Joh
a
n
nes Sch
i
n
del
i
n
Int
r
odu
c
e GIT_TEMPLATE_D
I
R
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C H
a
mano
R
e
vert
"
f
i
x tes
t
suite: make su
r
e
t
hey use temp
l
a
t
e
s
.
.
.
commit
|
commitdiff
|
tree
2006-12-19
Junio C Hamano
fix
testsu
i
te: mak
e
su
r
e
t
hey use templates freshly
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio
C Hamano
rerere
:
fix breakage of r
e
solving
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Aneesh Kum
a
r K
.
V
Ad
d
co
n
fig exampl
e
with res
p
ect to bra
n
ch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Brian Gernh
a
rdt
Add
d
ocumen
t
ation for show-bran
c
h
-
-
t
opics
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Nicolas Pitre
mak
e
g
i
t a bit less cryptic on fetch erro
r
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Nicolas Pitre
make
p
atch_del
t
a() error cases a bit
more verbose
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Jun
i
o C H
a
mano
r
a
cy-gi
t
: documentation upda
t
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C
Hamano
show-ref: fix --exclud
e
-existing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C
H
amano
parse-remote::
e
x
pa
n
d_refs_wil
d
c
ard()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Jeff
K
i
n
g
vim syntax: follow
re
c
ent ch
a
nges t
o
commit te
m
plate
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
sho
w
-ref:
fix --veri
f
y
-
-hash=length
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
J
u
nio C Ha
m
ano
show-ref: fix --quiet --verify
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
J
u
nio C Hamano
M
e
rge branch 'jc/blame
-
boundary'
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
Mer
g
e b
r
a
nch
'j
c
/reflog'
(
e
arly
part)
commit
|
commitdiff
|
tree
2006-12-18
Junio
C
H
amano
Merge branch 'js/branch-c
o
nf
i
g
'
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
Merge
b
ranch 'jn/web' (
e
arly
p
art)
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hama
n
o
avoid accessing
_
all_ loose refs in git-show-ref -
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C
H
amano
gi
t
-fetch: Avoid reading packe
d
refs over
and over
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Juni
o
C Ham
a
no
Teach sh
o
w-branch how to show ref-log dat
a
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Jun
i
o C Hamano
m
a
r
kup fix in svnimport do
c
umen
t
atio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Quy Tonthat
Documentati
o
n:
new option -P fo
r
g
i
t-
s
v
nim
p
ort
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
J
u
n
io C
H
a
m
an
o
Fix mis-mark-up in gi
t
-merge-file
.
txt docu
m
entation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Sh
a
w
n
O
.
Pearc
e
De
f
ault GIT_C
O
MMIT
T
ER_N
A
ME to log
i
n
n
am
e
i
n recieve
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Haman
o
Fix check_file_directory_
c
onflict()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
J
u
ni
o
C Haman
o
git-ad
d
: remove conflicting
entry
whe
n
add
i
ng
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
update-i
n
dex:
m
a
ke D/F
c
onflict error a bit
mor
e
v
erbo
s
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Johannes S
c
hi
n
deli
n
git-
b
ranch: rena
m
e config vars branch
.
<bra
n
ch>
.
*, too
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
J
ohanne
s
Schindelin
add a function to rena
m
e
sect
i
ons in t
h
e config
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
J
unio C Hama
n
o
git-cl
o
ne:
lose the tr
a
diti
o
nal 'no-s
e
p
arate-remote
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Hamano
git
-
clone
:
lose the artifi
c
i
a
l "
f
i
r
s
t
" fetch refspec
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Hamano
git-pul
l
: refu
s
e default merge without branch
.
*
.
merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Hamano
git-clone: us
e
wildcard specif
i
cation for tr
a
ck
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Hamano
me
r
ge:
give a bi
t
pr
e
ttier
me
r
ge message to
"merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
J
akub
N
arebski
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 tit
l
e attribute to ref m
a
rke
r
with full
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
J
akub Nar
e
b
s
ki
gitweb:
Do not
show difftree fo
r
merges in "
c
o
mmi
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Johannes
S
chindelin
Docum
e
nt git-merge
-
f
i
l
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Qu
y
Tonthat
git-c
l
one
doc
u
me
n
tation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Andy
Parkins
git-status always say
s
w
h
at br
a
nch it'
s
on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Shawn O
.
Pearce
A
l
ign se
c
tion h
e
ad
e
rs of 'git status' to new
'
git a
d
d
'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Shawn O
.
P
e
a
r
c
e
Suggest
us
e
of "git add file1
file2"
when t
h
er
e
is
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Brian Gernhardt
Make gi
t
-diff do
c
umentation use [
-
-
] when it
should
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Br
i
an Gernha
r
dt
Add
--
a
dd
o
ption to g
i
t-repo-conf
i
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Sha
w
n
O
.
Pearc
e
Teach
bash
t
he
new features
of 'git sho
w
'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Luben Tui
k
ov
E
x
p
o
rt PERL_PATH
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Shawn O
.
Pearc
e
E
nable reflog
s
by default
i
n
any r
e
posit
o
ry w
i
t
h
a
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Shawn O
.
P
e
arce
P
r
ovi
d
e more meaningful output f
r
o
m 'g
i
t
i
nit-
d
b'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
N
icolas
Pitre
make commit message a little more co
n
s
istent and
c
onforting
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Shawn O
.
Pe
a
rc
e
Avoid a
c
ce
s
si
n
g a slow wo
r
king cop
y
during diffcor
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio
C
H
ama
n
o
Me
r
g
e
br
a
nch
'
js/show'
commit
|
commitdiff
|
tree
2006-12-14
Joh
a
nnes S
c
hindelin
git-sho
w
: grok blobs, trees
and
ta
g
s, t
o
o
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
J
uni
o
C Hamano
git-reset [--mixed]
<tree> [
-
-
] <paths>
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio C
H
aman
o
git-reset: make it work from
wi
t
hin a subdire
c
to
r
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio C
H
a
mano
git-
f
e
tch: make it work from within
a
su
b
dire
c
tory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Joh
a
nnes
Schindelin
INSTA
L
L: no n
e
e
d
t
o have
GNU diff installe
d
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio C H
a
m
a
no
M
e
rge
b
ranch '
m
aint'
commit
|
commitdiff
|
tree
2006-12-14
S
h
awn O
.
Pearce
Bypass exp
e
nsive conten
t
comparsion during rename detect
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Juni
o
C H
a
mano
Update git-diff
docum
e
ntation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
J
u
nio
C
Hamano
Me
r
ge branc
h
'jc/diff--cached'
commit
|
commitdiff
|
tree
2006-12-13
J
un
i
o C Hamano
git-svn:
a
llow bo
t
h diff
.
color and color
.
dif
f
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Nicolas Pitre
repacked packs should be read
-
only
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o
C
Hamano
config docum
e
ntation: group c
o
lor items together
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
E
ric Won
g
gi
t
-svn:
c
or
r
ect
l
y handle "(no author)" wh
e
n us
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
uni
o
C Ha
m
a
no
git-blame: show lines attr
i
bu
t
ed
t
o bou
n
dary commits
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
uni
o
C Hamano
Merge
branch 'jc/read-tree-ignore'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Haman
o
M
e
rge branch 'ew/rerere'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Haman
o
Merge branch '
n
p/addcommit'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge branch
'
l
h
/
br
a
nch-ren
a
m
e'
commit
|
commitdiff
|
tree
2006-12-13
Junio C
H
amano
Mer
g
e
branch 'jc/commit-c
a
reful'
commit
|
commitdiff
|
tree
2006-12-13
J
unio C
H
amano
Merg
e
b
r
a
nch
'
a
p/clone-origi
n
'
commit
|
commitdiff
|
tree
2006-12-13
J
un
i
o
C Hamano
Merg
e
bran
c
h 'jc/nu
m
stat'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge b
r
anc
h
'r
r
/cvs
e
x
p
ortc
o
mmit'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge branch
'
ap/branch'
commit
|
commitdiff
|
tree
2006-12-13
Junio C
H
aman
o
b
r
a
n
ch --col
o
r: cha
n
ge default c
o
lor se
l
ection
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Ham
a
no
Merge b
r
anch '
j
s/merge'
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C
Hamano
send-pack: tighten che
c
k
s for r
e
mote nam
e
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Ham
a
no
g
it-push: acc
e
pt tag <tag> as adve
r
tised
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
spuri
o
us
.
sp in m
a
npages
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
unio C
H
a
m
ano
git
m
e
r
ge:
reword failure messag
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Sha
w
n Pearce
R
emove unconte
s
te
d
renamed files dur
i
ng merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C Hamano
R
evert
"
git-diff: In
t
roduce --index and depreca
t
e
.
.
.
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge b
r
a
nch 'maint'
commit
|
commitdiff
|
tree
2006-12-13
Eric
Wong
g
it-svn: cor
r
ectly di
s
play fatal()
error messa
g
es
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Eric Wong
g
it-svn: exit wit
h
status 1 for
t
est failures
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Andy Pa
r
kins
Allow s
u
bcommand
.
c
o
lor and
c
olor
.
subcomm
a
nd
color configur
a
tion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C Hama
n
o
g
i
t
-push: d
o
cument r
e
moval of rem
o
te ref with :<
d
st
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Johannes Schi
n
delin
me
r
ge-recursiv
e
: add
/
add really is mo
d
if
y
/modify w
i
t
h
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C H
a
mano
Merge branch 'master' into j
s
/m
e
rge
commit
|
commitdiff
|
tree
2006-12-13
J
oh
a
nnes Schind
e
lin
Get rid of the dependency on RCS'
m
e
r
ge
p
rogram
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
E
ric Wo
n
g
git-svn: correctly handle packed-
r
efs in refs/remo
t
es/
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio
C Hamano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2006-12-13
Junio C H
a
mano
add test cas
e
for
r
ecu
r
sive merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Eric Wo
n
g
git-svn: co
r
r
e
c
tly dis
p
l
a
y
f
atal() error m
e
ss
a
ges
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Eric Wong
git-svn
:
allow dcom
m
it
to
take an a
l
ternate head
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next