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
Ham
a
no
Use 'merge-b
a
se --all' wher
e
app
l
icable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-10
Juni
o
C Hamano
Merg
e
branch 'hold/svn
'
commit
|
commitdiff
|
tree
2005-11-10
Junio C Hamano
Mer
g
e branch 'hold/rpm'
commit
|
commitdiff
|
tree
2005-11-09
Junio C Hamano
git-apply: do not fail on binary diff
when no
t
applyi
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-09
J
u
nio C Hamano
Update INS
T
A
L
L
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Ku
i
v
i
ne
n
merge-
r
ecursive: Fix suppo
r
t f
o
r
branch names containing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuivinen
merge-recu
r
sive: Fix limited output of rename m
e
ssages
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-09
Alexa
n
der Litvinov
Fix c
v
se
x
port
c
o
m
mit s
y
n
t
ax error
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-09
Luc
k
, Tony
Update howto us
i
ng-topic
-
b
ra
n
ches
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-09
Peter Hager
v
all
spars
e
fixe
s
for h
t
tp-{fetch,p
u
sh}
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Ka
i
Ruemmler
git-tag -
d
<
t
ag>:
dele
t
e tag <tag>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Alex Riesen
m
a
ke te
s
ts
igno
r
able with "make
-i"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Alex Riese
n
fix t5
0
00-tar-t
r
ee
.
s
h when $TA
R
isn't set
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C
Hamano
Clean build
annoyance
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Jim Radfor
d
Separate RPMS for
p
rograms with non-sta
n
dard de
p
endencie
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio
C
Hama
n
o
Fix a
c
o
u
ple of obvio
u
s and insignificant typo
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Yaa
c
ov Akiba Slama
L
i
ft the
def
a
u
l
t limit o
f
n
umber o
f
revs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Yaacov Akiba Slama
Ha
n
d
l
e a revision that only cr
e
ates
a
ne
w
tag correctly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Yaa
c
ov
Akiba Slama
Bundle file cop
i
es from
multiple branches into a merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Yaacov Akiba Slam
a
copy_dir b
e
comes
copy_
p
at
h
and
handl
e
s both files and
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Yaacov
A
kiba Slama
Don't output er
r
or on changes in the nodes /, /t
a
gs
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Yaacov Akiba Slama
Add node_kind function to
d
ifferenti
a
t
e
between file
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Y
aacov Akiba Slama
Use svn pools to solve the memory
leak prob
l
e
m
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
J
u
nio
C
Hamano
git-am: do not
lose
already edited fin
a
l-c
o
mm
i
t w
h
en
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Al
e
x
R
iesen
ls-fil
e
s a
n
d
read-tree need core
.
filemode
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C H
a
mano
Debian: packaging updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
J
o
n Loeli
g
er
Use consistent shell p
r
o
m
p
t
s and example style
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Jon Loeliger
A
dd
--tags docume
n
tation, scrape
d
from JC mail
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Nick Hengev
e
ld
Add
s
upport for git-htt
p
-push t
o
git-push
scr
i
p
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Ham
a
n
o
T
utorial: do
not u
s
e 'git resolve'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hama
n
o
Docu
m
en
t
a
tion
:
fix dependency generation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Jon Loeliger
Add bu
g
isolation howto
,
scraped fr
o
m Linu
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
J
unio
C Ham
a
no
Igno
r
e mo
r
e generate
d
fi
l
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C
H
amano
Fi
x
do
c
ume
n
tati
o
n de
p
e
ndency generation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio
C
Hamano
Documentation: ascii
d
oc formattin
g
fix fo
r
g
i
t-cvsexportcomm
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
F
redrik
K
uivinen
merge-recursive: Only print
relevant rename messag
e
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Ju
n
io
C
Haman
o
Do
n
ot fail
on hierarchica
l
t
a
gnames
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Johannes
S
chindelin
Small bugfixes
f
o
r http-push
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Nick H
e
ngeveld
Make h
t
tp-push smarter about creat
i
ng
remote d
i
rs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Martin Langhoff
Introd
u
cing: git-cvsexpo
r
tcomm
i
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Kai Ruemmler
Docu
m
entation upda
t
e: use git branch -d foo
where applicable
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Junio
C Ha
m
a
n
o
Recove
r
drop
p
ed +x bit from
g
it-pull
.
sh by accident
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Junio C H
a
m
a
no
Documentation: talk a
b
out guts of merge in
t
utorial
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
J
on Loeliger
Refactored
m
erge options in
t
o sepa
r
a
t
e me
r
ge-opt
i
ons
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Johan
n
es Schinde
l
in
http-fetch
:
do not use
c
u
r
l
_message a
f
te
r
releasing it
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Jo
h
a
n
ne
s
Schindelin
Allow GIT_D
I
R
t
o be an absolute path
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Paul
Collin
s
http-push
.
c: include with angle bra
c
ket,
n
o
t dq
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Junio C Ha
m
an
o
S
et up remotes
/
origi
n
to track all remote branches
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Junio C
H
a
m
ano
git-sta
t
u
s: do not
m
a
r
k unm
e
rge
d
pat
h
s as committable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
J
u
n
io C Hamano
ls-f
i
les
:
-
-others should not say unmerged pa
t
hs are
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Randal
L
.
Schwartz
Use
fin
k
/
darwinport path
s
for OSX
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Jon Loeliger
Refactor merge strategies
in
t
o separate includable
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C H
a
ma
n
o
Document e
x
pat dependency
w
hen using
h
ttp-
p
ush
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Jun
i
o C Haman
o
Merge in http-push
f
i
rs
t
stage
.
commit
|
commitdiff
|
tree
2005-11-06
Nick He
n
ge
v
eld
R
e
fresh the remote lock if it is about to expire
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
N
ick Hengeveld
Improve
lock handlin
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Nick
H
engeve
l
d
Support remote re
f
eren
c
es with slashes
in their names
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Nick Hengeveld
V
er
i
fy re
m
ote packs
,
spe
e
d
up pendi
n
g
reque
s
t queue
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Ni
c
k Hengeveld
Add suppor
t
for
p
ushing
t
o a remote repository u
s
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Ham
a
no
Debian
:
test build
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
Further Debian split fixes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
I
n
stall
asciidoc sour
c
e
s
as we
l
l
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
J
unio C Hamano
Pac
k
age split: Deb
i
an
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C
Hamano
Simplify CFLAGS/DEFINE
S
in Makefile
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Juni
o
C Ha
m
ano
git-f
e
t
c
h: fail if spe
c
ified refspec does
not match
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C
H
a
m
ano
Doc
u
menta
t
ion: pull/cl
o
ne ref
map
p
ing clarification
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
git-format-patc
h
: silly typo fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hamano
test: t41
0
2-ap
p
l
y
-rename fa
i
l
s
w
ith stric
t
umask
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Ha
m
a
n
o
git-clone
:
fix local clone
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio
C
H
amano
init-db::copy_file() -
use copy_fd()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
J
unio C Hama
n
o
co
p
y
.
c::copy_fd() - do not leak file d
e
scr
i
p
tor
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hamano
Documentation: format-p
a
tch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hamano
format
-
patch: "rev1
.
.
" should mean
"rev1
.
.
HE
A
D"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
J
unio
C
Hamano
Documentation: git-fe
t
ch/pu
l
l
u
pdates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
J
on
L
o
el
i
ger
Add
e
d a few ex
a
mples to gi
t
-pul
l
m
an page
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C H
a
mano
Documen
t
the --no-commit flag better
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
J
u
nio C H
a
m
a
no
Doc
u
mentation: -merge and -pull: describe merge strategies
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
J
u
nio C Hamano
Do
c
umentati
o
n:
g
it-add -- do not s
a
y "cache", add e
x
amp
l
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
Jun
i
o C
H
a
mano
git-tag: Do not assume the working
t
r
ee roo
t
is writabl
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
Nick Hengevel
d
R
emove th
e
temp f
i
le
i
f it is empty after
t
h
e request
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Illustratio
n
: "Commit DAG Revis
i
on
N
amin
g
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Ill
u
stration:
"
G
it Diff Types"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Juni
o
C Hamano
Illustr
a
tion: "Fu
n
dam
e
nta
l
Git Inde
x
O
p
erations"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Jun
i
o C Ham
a
n
o
git-mer
g
e-ou
r
s: make sure our i
n
de
x
m
atches
H
EA
D
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Add 'ours' merge strat
e
gy
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
J
u
n
i
o C Hamano
A
d
d --
n
o-c
o
m
mit
t
o
git-merg
e
/git-pull
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C H
a
m
ano
Document --since and --until options to
r
ev-par
s
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Be ca
r
e
f
ul
when der
e
feren
c
ing tags
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Peter Eriksen
[PATCH]
Clean up the SunOS
M
a
k
efile ru
l
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio
C
H
amano
I
g
nor
e
'\r' at the end of line in $GIT
_
DI
R
/
c
onfig
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Al
e
x
R
iesen
remove CR/LF from
.
gitignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Ham
a
no
Do not fail on hi
e
rar
c
hica
l
bra
n
ch n
a
mes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C
H
aman
o
Make test-date bu
i
l
dable
aga
i
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Junio C Hamano
git-clone: do not forg
e
t to cr
e
ate origin
bran
c
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Junio C
Haman
o
Do not put automat
i
c
merge
m
essage after signe
d
-off
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Junio C Hamano
Add
-
P to th
e
docume
n
tation
h
e
a
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
M
ar
t
i
n
L
anghoff
cvsimport: cvs
p
s
s
hould be quiet
too
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Mart
i
n La
n
ghoff
cvsimport: introdu
c
e -P <cvsps-output-file
>
option
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Martin Langhoff
c
v
s
i
m
port: catch
e
r
r
or
c
ondit
i
on
where cvs host
d
isappear
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
J
u
nio
C
Ham
a
no
D
o
not install backward compati
b
ility link
s
anymor
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next