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
Use 'merge-base --all' where applicable.
2005-11-10
Junio C Hamano
Use 'me
r
ge-base --a
l
l
' where
applica
b
le
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-10
Junio C Hamano
Merge branch
'
hold/svn'
commit
|
commitdiff
|
tree
2005-11-10
Ju
n
io C Hamano
Merge branch 'hold/r
p
m'
commit
|
commitdiff
|
tree
2005-11-09
Junio
C
H
amano
git-appl
y
:
do not fa
i
l
on b
i
nary di
f
f when not a
p
plying
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-09
Junio C
H
amano
Upda
t
e INSTALL
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuivinen
merge-recurs
i
ve: Fix
support for branch names containi
n
g
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-09
Fred
r
ik Kuivinen
m
erge-recursive: Fix
l
i
mit
e
d output
of r
e
nam
e
messag
e
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-09
Alex
a
nde
r
Litvinov
Fix cvs
e
xportcommit s
y
n
t
ax error
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-09
Luck, T
o
n
y
Update
howto using-topic-branche
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-09
Peter Hag
e
rvall
sp
a
rs
e
fixe
s
for
http-{fe
t
ch,push}
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Kai Ruemmle
r
git-tag -d <tag>
:
del
e
te tag <ta
g
>
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Alex Riesen
make tests
i
gnorable wi
t
h "make -i"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
A
l
ex Riesen
fix
t
5000-tar-tree
.
sh
when
$
TAR isn't s
e
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Jun
i
o
C Ha
m
ano
Cl
e
a
n
b
u
ild annoy
a
nce
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
J
im Radford
Se
p
a
rate RPMS
fo
r
programs
with non-standard
de
p
end
e
ncies
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio C
Hamano
Fix a
c
ouple of obviou
s
and insignificant typo
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Y
a
a
c
ov Akib
a
Slama
Lift the default l
i
mit of number of revs
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Y
aac
o
v A
k
ib
a
Slama
Ha
n
dle
a
revision t
h
at o
n
ly crea
t
e
s a new
t
ag
c
or
r
ectl
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Yaacov Ak
i
ba Slama
Bundle fil
e
copies from multiple
branches i
n
to a merge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Yaac
o
v Akiba Slama
copy_dir becomes co
p
y_
p
ath a
n
d handles both file
s
and
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Yaacov
A
k
iba
S
l
a
ma
Don't output e
r
ror on changes in the nodes /, /
t
ags
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Yaacov
A
kiba Slama
Add node_kind function to d
i
fferentiate be
t
we
e
n file
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Yaacov Akiba Slama
Use svn pools to solve the me
m
ory leak pr
o
blem
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Jun
i
o C Ha
m
a
n
o
git-am: do n
o
t l
o
se
already e
d
ited final-commit when
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Alex Riesen
l
s-
f
i
l
es a
n
d re
a
d
-tree need cor
e
.
filemode
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio C H
a
mano
Deb
i
an: packa
g
ing update
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Jon Lo
e
lige
r
U
se consist
e
nt shell
p
ro
m
pts and ex
a
mple style
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Jon Loeliger
Add --tags documentation,
scrap
e
d from JC mai
l
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Nick
H
engeveld
Add sup
p
ort
f
or git-http-push to
g
it-push script
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio
C
H
amano
Tutori
a
l: do not use 'git resol
v
e'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Jun
i
o
C Haman
o
D
o
c
ume
n
tat
i
on
:
fix de
p
endenc
y
generation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Jon L
o
eli
g
er
Add bug
isolation
howto, scraped
f
r
om Li
n
us
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
J
u
ni
o
C
Hamano
Ig
n
ore more generated
f
iles
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
Fix documentati
o
n dep
e
nd
e
ncy generation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Juni
o
C Haman
o
Documen
t
ation: as
c
iid
o
c formatting fix for git-cvsexportcomm
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik Ku
i
vi
n
en
m
erge-recursive:
Only
print
r
elev
a
nt rename m
e
ssages
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
D
o not
fail on hierarch
i
c
al tagnames
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Johannes Schindelin
S
ma
l
l
bugfixe
s
for http-push
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Nick Hengeveld
Make
ht
t
p-pus
h
smarter abou
t
creating remote dirs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
M
a
rtin Langhoff
I
n
troducing: git-c
v
se
x
portcommit
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Ka
i
R
u
emmler
Docum
e
ntation u
p
date: use gi
t
branch -d foo
w
here applicable
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Jun
i
o C Ha
m
ano
Recover dro
p
ped +x bit
from g
i
t-p
u
ll
.
s
h
by accident
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Junio C H
a
mano
Documentat
i
on:
talk about guts of merge in tutor
i
al
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
J
on Lo
e
lig
e
r
Ref
a
c
t
ored merge option
s
int
o
se
p
a
rate merge-op
t
ions
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
J
o
hannes Schindelin
http-f
e
tch
:
do not use curl_mess
a
g
e
after relea
s
ing i
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Jo
h
a
n
ne
s
S
chind
e
lin
Allow
G
IT_DIR to be an absolute path
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Pau
l
Colli
n
s
http-push
.
c:
i
nclude with a
n
gle bracket, not dq
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Junio C
Hamano
Set up remot
e
s/origin to
track all remote branches
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Ju
n
io
C Hamano
git-st
a
tus: do not ma
r
k
u
nmerged paths as
committable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-07
Junio
C
Hamano
ls-files: --other
s
s
h
o
uld not say u
n
merged paths are
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Randal L
.
Schwa
r
tz
U
se fink/d
a
rwinp
o
rt paths
f
o
r O
S
X
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
J
o
n Loeliger
Refactor me
r
ge strate
g
ies into se
p
a
r
ate includabl
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Juni
o
C Hamano
Doc
u
ment expat dependency
w
hen usi
n
g
h
t
tp-push
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio C
H
amano
Merge in http-push first
s
t
a
ge
.
commit
|
commitdiff
|
tree
2005-11-06
Nick
H
engeveld
Refre
s
h the remote
lock
i
f it is about to
e
xpire
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Nick Hengeveld
Im
p
rove l
o
ck handling
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Nick
Henge
v
eld
Sup
p
ort remote ref
e
rences with sla
s
hes in t
h
eir names
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Nick He
n
g
e
v
eld
Verify
r
emote packs, sp
e
ed up p
e
nding request
queue
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Nick He
n
geveld
A
d
d support for pus
h
ing t
o
a remote repository usi
n
g
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Jun
i
o
C Hamano
Debian:
t
est build
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Juni
o
C Hamano
Furth
e
r Debian split fixes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
Instal
l
asciidoc
s
ource
s
as well
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Ju
n
io C Ha
m
ano
Packa
g
e spl
i
t:
D
e
bian
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
Simp
l
ify C
F
LAGS/D
E
F
I
NES in Makefile
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Ju
n
io C Hamano
git-fetch: f
a
il if specified r
e
fspec does
not m
a
tch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Jun
i
o C Hamano
Documentation:
p
ull/clone
r
ef mapping clarification
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-06
Juni
o
C Hamano
git-
f
ormat-patch: silly typo f
i
x
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Juni
o
C
H
amano
test:
t4102-apply-rename fails with strict u
m
as
k
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hamano
git-
c
lon
e
:
f
ix lo
c
al c
l
o
ne
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Junio C
H
a
mano
init-db::cop
y
_file()
- us
e
copy_fd
(
)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Junio C H
a
m
ano
copy
.
c::copy
_
fd() - do
not leak file descrip
t
or
on
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Junio
C Ha
m
ano
Do
c
umentat
i
o
n
: f
o
rmat-p
a
tch
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Jun
i
o
C
Hamano
for
m
at-
p
a
tch:
"
r
e
v1
.
.
"
should
m
e
an
"rev1
.
.
HEAD"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Junio
C
Hamano
Documen
t
ation: git-fet
c
h/p
u
l
l
updat
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
Jon Loeliger
Added a fe
w
examples to
git-pu
l
l man page
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-05
J
u
nio C
Ha
m
ano
Docume
n
t
the
--no-com
m
it flag bett
e
r
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-04
Junio
C Hamano
Docu
m
e
n
t
a
t
i
o
n:
-
merge and -p
u
ll: describe
mer
g
e str
a
teg
i
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-04
Junio C Haman
o
Documentation: git-add -- do not sa
y
"cache", add e
x
amples
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-04
Junio C Ha
m
ano
git-tag
:
D
o not a
s
sume
t
he working tr
e
e root is writ
a
b
l
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-04
Nick H
e
ngeve
l
d
Remove
t
h
e
temp file if it is emp
t
y after t
h
e
req
u
est
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Ju
n
io C Ha
m
ano
I
l
lust
r
ation: "Commit DAG Revision Naming"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C H
a
m
ano
Illustration: "Gi
t
Diff
Type
s
"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
J
u
nio C
Hamano
Illustration: "
F
u
n
damental Git Inde
x
Oper
a
tions"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
git-merge-ou
r
s: make
su
r
e o
u
r index matches HEAD
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Jun
i
o
C
Hamano
Ad
d
'ours' merge strategy
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Ju
n
io C
H
amano
Add --no-com
m
it to git-merge/git-pull
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Ha
m
ano
Document --
s
ince and --unt
i
l optio
n
s
t
o rev-pars
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
J
u
nio C Haman
o
Be careful when
dereferencing tags
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Peter Eriksen
[PA
T
CH] Cl
e
an up
t
he
S
unOS Mak
e
f
i
l
e
r
u
le
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio
C
Ham
a
n
o
Ignore
'
\r
'
a
t the end of line in $GIT_DIR/config
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Alex Riesen
remove
C
R/LF fr
o
m
.
gitignore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Do not fail on hiera
r
chical
branch na
m
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
M
ake test-date buil
d
able aga
i
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
Junio C Hamano
git-clone: do no
t
f
o
rget
t
o crea
t
e origin branch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
Junio C Hamano
Do no
t
p
ut automatic merg
e
me
s
sage after signed-off
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
Juni
o
C Hamano
Add -P to the documentation head
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
Martin Langhof
f
c
vsimport:
c
vsps
s
hou
l
d be q
u
i
et to
o
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
Martin Langho
f
f
cvsimport
:
introduce
-P <cvsps-outpu
t
-f
i
l
e
> option
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
M
a
rtin Langhoff
cvsimport: cat
c
h er
r
or c
o
ndition where cv
s
h
o
st di
s
appear
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
Junio
C Hamano
Do not
i
nst
a
ll backward c
o
mpatibility links anymore
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next