repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: Use '~' instead of '_' to separate file names from branch names
2005-11-12
Fre
d
rik Kuivinen
merge-recursive: U
s
e
'
~' instead of
'
_' to separate
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Fred
r
ik
Kuivinen
me
r
ge-recu
r
sive:
Add copyr
i
ght notice
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Fredr
i
k Kuivinen
merge-re
c
u
rsiv
e
:
In
d
ent the output properly
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
L
u
ka
s
_Sands
t
r
öm
Change 'cach
e
'
t
o 'index' in the docs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Ju
n
io
C
Hamano
INSTALL: duplicate python
r
e
q
uirements from Makef
i
l
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Ha
m
ano
Merge branches 'jc/sb'
a
nd '
j
c/mb
'
commit
|
commitdiff
|
tree
2005-11-11
J
unio C
H
am
a
no
t
1
2
0
0: us
e
--topo-order to keep t
h
e show-branch outp
u
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
F
u
lly detect uninte
r
esting commits
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Juni
o
C Hamano
git-show-
b
ra
n
c
h: t
i
ghten me
r
ge-base computation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
J
unio C Haman
o
Add
t
est case for mer
g
e-base
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hama
n
o
m
e
rge
-
base: av
o
id un
n
ec
e
ssary postprocessi
n
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Jun
i
o C H
a
man
o
merge-base
:
fully contaminate the well
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
RPM
:
arch
s
u
b
m
odule needs tl
a
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Andreas
E
ricsson
git
-
cl
o
n
e: Allow cloning
into directories o
t
her th
a
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Andreas
E
ricsson
git-clo
n
e: Ke
e
p remote name
s
w
h
e
n
c
l
o
ning unless
explicitly
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Chris Wright
s
p
ecfile c
l
eanups
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Martin Lang
h
o
f
f
archimport: handle pika escaping
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
P
avel Ros
k
in
git-clone: quote des
t
inat
i
on directory
n
a
me
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
P
a
v
e
l Roskin
Ad
d
--no-com
m
it-id opt
i
on fo
r
git-diff-tree, u
s
e
it
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
octopus: do not
d
o
AND'ed merge base
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C
H
a
ma
n
o
Add --pret
t
y
=
fuller
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
Do n
o
t
lose a
u
thor
name informatio
n
to loca
l
e
gotchas
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
J
unio
C
H
am
a
no
Docu
m
e
n
tatio
n
: "host:path/to/repo" is
g
it native over
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-10
Josef Weid
e
n
do
r
fer
Let git-
c
lone/git-fe
t
c
h follow H
T
TP redir
e
ctions
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-10
Pet
r
Baudis
Fix co
n
fusing git-update
-
ref error message
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-10
J
i
m Radf
o
rd
Add m
i
ssing git-
c
ore and cvsps
R
PM dependencies
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-10
Jun
i
o C
H
amano
M
a
k
e git-recurs
i
ve
t
he defau
l
t strateg
y
for
g
it-pull
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-10
Ju
n
io
C
Ha
m
a
n
o
Use
'
me
r
g
e
-
bas
e
--all
'
where applicab
l
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-10
Junio C Hamano
Merge branc
h
'ho
l
d/svn'
commit
|
commitdiff
|
tree
2005-11-10
Ju
n
io C
H
aman
o
Merge branch
'hold/rpm
'
commit
|
commitdiff
|
tree
2005-11-09
Junio C
Hamano
g
i
t-app
l
y: do not f
a
i
l
on binary diff when no
t
a
pplying
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-09
Junio C
Hamano
Update
I
NSTALL
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-09
Fr
e
d
rik Kuivinen
m
e
r
ge-
r
e
c
ursive: Fix
s
upport for
b
ra
n
ch na
m
e
s
c
o
ntaining
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kui
v
inen
m
e
rge
-
recursive:
F
ix lim
i
ted outpu
t
of re
n
ame mes
s
ages
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-09
Alexander L
i
tvi
n
ov
Fix cv
s
expor
t
commit sy
n
tax erro
r
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-09
Luck, Tony
Update
howto usin
g
-topic-bran
c
hes
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-09
P
e
ter
Hagervall
sparse f
i
xe
s
for
h
t
t
p-{fetch,pus
h
}
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Ka
i
R
u
emmler
git-tag
-d <tag>: delete tag <ta
g
>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
A
l
e
x Riesen
mak
e
tests ignorable with "make
-i"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Ale
x
Riesen
f
ix t5000-
t
ar-tree
.
sh whe
n
$TAR is
n
't set
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
J
unio C Hamano
Cle
a
n build ann
o
yance
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Ji
m
R
a
dford
Separate RPMS
fo
r
program
s
wit
h
non-stan
d
ar
d
dependen
c
ies
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
J
u
nio C Hamano
Fi
x
a couple of obv
i
ous and insigni
f
icant typo
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Yaa
c
ov A
k
i
b
a Sl
a
ma
Lif
t
the default limit of number of revs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Ya
a
cov Akiba Slama
Ha
n
dle a revision
t
ha
t
only crea
t
es a new tag correctly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Yaacov Akiba Slama
Bundl
e
file copies
f
r
om
m
ultip
l
e branch
e
s in
t
o a merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Y
a
a
cov Akiba
S
lama
c
o
p
y
_dir
bec
o
mes
c
opy_path and handles both
fil
e
s and
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Y
a
aco
v
Akiba
Slama
Don't outpu
t
error
o
n changes in the
nodes /, /tags
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Yaacov Akiba Slama
Add node
_
ki
n
d funct
i
on t
o
differentiate betwe
e
n file
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Yaacov Akib
a
S
lama
Use
svn
pools to solve the memory l
e
ak problem
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio
C Hamano
git-am:
d
o
n
ot los
e
already edited final-c
o
mmit when
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
A
lex Riesen
ls-files
a
n
d
r
ead-tree
n
eed
c
ore
.
filemode
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Ju
n
io C Hamano
Deb
i
an: packaging u
p
d
ates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Jon Loel
i
ger
Use consiste
n
t
sh
e
ll p
r
o
m
pts and example
s
tyle
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Jon Loeli
g
e
r
Add --tags docum
e
ntatio
n
, s
c
r
aped fr
o
m
JC m
a
i
l
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Ni
c
k Heng
e
v
eld
Add sup
p
ort for git-http-
p
ush to
g
it-push scr
i
pt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
J
un
i
o C Hamano
Tutorial: do
not use 'git resolve'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
J
u
nio C Ham
a
no
Document
a
tio
n
: fix de
p
endenc
y
gen
e
ration
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Jon Loeliger
Add bug isolation ho
w
to, scrap
e
d from Linu
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
Ignore more generated fi
l
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
Fix
d
o
c
umentation dependency gene
r
at
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
D
ocumentation:
asc
i
i
d
o
c
form
a
t
t
ing fix for git-cvsexportcomm
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Fredr
i
k Kuiv
i
nen
merge-recursi
v
e: Only print rele
v
ant
r
ename messages
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
J
u
nio
C
H
amano
D
o
not f
a
il on hierarchical tagnames
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Jo
h
annes Sc
h
ind
e
lin
Sm
a
ll bugfixes for http-push
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Nick
Heng
e
ve
l
d
Make http-p
u
sh smarter about creating remote di
r
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Mart
i
n Lan
g
hoff
Introduc
i
n
g
:
git
-
cvsex
p
ortcomm
i
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
K
ai
Ruemml
e
r
Doc
u
mentatio
n
update:
use
git branch -d
f
oo
where
applicable
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Junio C Ha
m
ano
Recov
e
r dropped +x
b
i
t
from git-pull
.
s
h by accident
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Junio C Hamano
Docum
e
ntation: t
a
lk about guts of mer
g
e in tutorial
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Jon Lo
e
l
i
g
e
r
Refact
o
red merge opt
i
on
s
into sepa
r
a
t
e merge-opt
i
ons
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Johannes Schindeli
n
http-fetch: do not use curl_messa
g
e
after
r
eleasing
i
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Johanne
s
Schindel
i
n
Al
l
ow GIT_DIR to be an absolute
p
ath
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Pa
u
l Col
l
i
ns
http-p
u
sh
.
c: inc
l
ud
e
with a
n
gle bracket, not d
q
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Junio C Ham
a
no
Set up remotes/origin to track all
r
emot
e
branche
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Junio C Haman
o
g
it
-
s
t
at
u
s: do
n
o
t
mark
unmerged paths as commi
t
table
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Junio
C
Haman
o
ls-files: --
o
thers should no
t
say unmerged paths are
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Randal L
.
Schwartz
Use fink/darwinport pat
h
s for OSX
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
J
on Loelig
e
r
Refactor merge strategies int
o
se
p
ar
a
te in
c
l
u
dabl
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hama
n
o
D
ocumen
t
e
xpat depe
n
d
e
n
c
y when using http-push
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
J
unio C Haman
o
Merge i
n
http-push first stage
.
commit
|
commitdiff
|
tree
2005-11-06
Nick Hengeveld
Refresh
t
h
e remo
t
e lock
i
f i
t
i
s
abo
u
t
to expir
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Nick Heng
e
veld
Improve l
o
ck handling
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
N
i
ck H
e
ngev
e
ld
Support remote
r
eferen
c
es with sla
s
hes in
their names
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Nick Hengev
e
ld
Verify remo
t
e pac
k
s, speed up pendin
g
r
e
quest queue
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Nic
k
Henge
v
e
l
d
Add support for p
u
shing t
o
a remote repository using
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Jun
i
o C Hama
n
o
Deb
i
a
n
:
test build
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
J
u
nio C
Ham
a
no
Fur
t
h
er Debian sp
l
i
t
fixes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
J
u
nio C Hamano
I
nstall asciidoc sources
a
s
w
ell
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
Package split
:
D
ebian
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio
C
H
a
ma
n
o
Simplify CFLAGS/D
E
FINES in Mak
e
fi
l
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
J
u
n
i
o C Haman
o
git-fetch:
fa
i
l if spe
c
if
i
ed re
f
s
pec does not
ma
t
ch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
J
u
nio C Hamano
Documentatio
n
: pull/clone r
e
f
mapping cl
a
rification
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C
H
amano
g
i
t
-format-patch: silly typo fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
J
u
n
io
C
Ham
a
no
t
es
t
: t41
0
2
-
app
l
y-rename
f
ails with str
i
ct
u
m
ask
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Ju
n
io C H
a
m
ano
git-cl
o
ne: fix l
o
ca
l
clon
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C
H
amano
ini
t
-
db::copy_f
i
le() - use
copy
_
fd()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C
H
amano
copy
.
c::copy_fd() - d
o
not leak file
de
s
criptor on
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
J
u
n
i
o C
Ha
m
ano
D
ocum
e
ntation: format-patch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
J
un
i
o C Haman
o
format-patch: "rev1
.
.
" should
me
a
n "rev1
.
.
HEAD"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next