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
Bundle file copies from multiple branches into a merge.
2005-11-08
Yaacov Akiba Slama
Bundle file copies from multiple br
a
nches
i
n
t
o a merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Yaacov Akiba Slama
c
o
p
y_d
i
r be
c
omes cop
y
_
path and
h
andles both files and
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Yaacov A
k
iba Slama
D
o
n't
output error on
c
hang
e
s
i
n
th
e
node
s
/,
/t
a
gs
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Y
a
acov Akiba Slama
Add node_kind
f
un
c
t
i
o
n
to
d
iffer
e
nti
a
te bet
w
e
e
n fil
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Yaacov Akiba Slama
Use svn pools to so
l
ve the me
m
or
y
l
e
a
k pro
b
le
m
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Jun
i
o C
H
amano
g
i
t-am:
d
o not lose alread
y
edited final-commit whe
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Alex Riesen
l
s-files and read-tree n
e
ed
core
.
filemode
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
Deb
i
an: packaging updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Jon Loeliger
Use consistent
shell
p
r
o
mpts and e
x
a
m
ple
s
tyle
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Jon Loeliger
A
dd --tags documentation,
s
craped from JC mail
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Nick Henge
v
eld
A
dd
s
upport fo
r
g
it-http-
p
u
sh
to git-
p
ush scr
i
pt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Ju
n
io C Hamano
Tuto
r
i
a
l
:
do not use 'git resolve'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Ju
n
io C Hamano
Docum
e
ntation: fix
d
epend
e
n
cy g
e
neration
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Jon Loeliger
Add bug isolation howto, sc
r
aped from Linu
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio
C
H
a
mano
Ignore mo
r
e generated files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Jun
i
o C Ham
a
no
Fix documentation depend
e
ncy ge
n
eration
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C H
a
mano
Documentation: asc
i
idoc formattin
g
fix for g
i
t-cvs
e
x
p
ortco
m
m
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Fredr
i
k Kui
v
inen
m
e
rge-recursi
v
e:
O
n
ly print
r
elevan
t
rename me
s
sages
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
J
un
i
o C Hamano
Do not fail on hierarchical tagnames
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Johanne
s
Schindelin
Sma
l
l bug
f
i
x
es fo
r
ht
t
p-push
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
N
i
ck
H
engeveld
Make http
-
push
s
marter
a
b
o
u
t creating remote dirs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Martin Langhoff
In
t
roducing: git
-
c
vsexpor
t
commit
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Kai Rue
m
ml
e
r
Do
c
umentation
updat
e
: use git
b
ranch -d foo where
a
pplicable
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Junio C Ha
m
ano
R
e
cover dropped +x bit from git-pull
.
sh by
accident
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Ju
n
io
C Haman
o
D
ocumen
t
atio
n
: talk about gut
s
of merge in tutor
i
al
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Jon L
o
eliger
Refa
c
tored merge o
p
tio
n
s into sepa
r
ate merge-options
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Johannes Schindelin
ht
t
p-fetc
h
:
d
o
not
u
s
e
c
u
rl_
m
essage after r
e
le
a
s
i
ng it
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Johannes Schindelin
Allow GIT_DIR to
be an abso
l
ute
p
ath
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Paul Collins
http-push
.
c: include with angle brac
k
et, no
t
dq
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Ju
n
io C Hamano
S
e
t up remotes/origin to
t
rack all
r
emote branches
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Junio C Hamano
git-statu
s
: d
o
n
o
t m
a
rk un
m
er
g
ed paths as c
o
mmit
t
able
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
J
u
nio
C Ham
a
no
ls-fil
e
s
: --
o
thers should not say
unm
e
rged paths are
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Randal L
.
Schwart
z
Use
fi
n
k
/
darwinpo
r
t paths for OSX
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Jon Loeliger
Refact
o
r merge strate
g
i
e
s into separate includabl
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
Document e
x
pat dep
e
n
dency when usin
g
http-pus
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
J
u
ni
o
C
Ha
m
ano
Merge in http-push firs
t
stage
.
commit
|
commitdiff
|
tree
2005-11-06
Nick Heng
e
v
e
ld
Refr
e
sh
the r
e
mote lock
i
f it is about
t
o
e
x
p
ire
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Nick Hengeve
l
d
Improv
e
l
ock handli
n
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Nick Hengev
e
ld
Support
r
emote
r
eferences with s
l
ashes in the
i
r n
a
m
e
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Nick Henge
v
e
ld
Ve
r
ify remote packs, speed up
pe
n
ding reques
t
q
u
eue
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Nick Hengevel
d
Add support for pushing
t
o a remote r
e
pository using
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Juni
o
C Haman
o
D
e
bian
:
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
Install a
s
ciidoc sources as well
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C
Hamano
Package
split: D
e
bian
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Ha
m
a
n
o
Simplify CFLAGS/DEF
I
NES in Makefile
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
J
u
nio C Ham
a
no
git-fetch: f
a
il if
specified refspec d
o
es
not match
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Ju
n
io C Hama
n
o
Doc
u
mentation: pull
/
clon
e
ref mapping clarif
i
cat
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
git-format-patch: silly
t
yp
o
f
ix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Ju
n
io C Ha
m
ano
t
e
st: t
4
1
0
2-apply-rename fails
wit
h
str
i
ct umask
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio
C
Hamano
git-clone: fix local clone
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C
H
amano
in
i
t
-
db::copy_f
i
le() - use copy_fd()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Juni
o
C
H
ama
n
o
copy
.
c
:
:cop
y
_fd() - do
n
o
t
l
eak file descript
o
r on
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C
H
a
mano
Do
c
ument
a
tion: fo
r
mat-patch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C
Hamano
form
a
t
-
patch: "re
v
1
.
.
" shou
l
d me
a
n "rev1
.
.
HE
A
D"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hamano
D
o
cumentatio
n
: git-fetch/pull update
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Jon Loelig
e
r
A
d
ded a few examples
t
o
g
it-pull man page
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
J
unio C
H
a
mano
Document the --no-commit flag better
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
Ju
n
io C Hamano
D
o
c
um
e
ntat
i
on:
-
merge an
d
-pull: descri
b
e me
r
ge s
t
rategies
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
J
u
nio C Hamano
Documentation: gi
t
-
a
dd -- do not
say "cache", add e
x
amples
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
J
u
nio C Ham
a
no
git-tag: D
o
no
t
assume
t
h
e working tree root is writable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
Nick
H
e
n
g
eveld
Remo
v
e
th
e
t
e
mp
f
i
le if it
i
s empty afte
r
th
e
requ
e
st
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C
H
amano
Il
l
ustration: "C
o
mmit DA
G
Revisio
n
Naming"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio
C
Haman
o
Illus
t
rat
i
on: "Git
Diff Typ
e
s"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Haman
o
I
l
lustrati
o
n: "Fun
d
a
m
ental
G
it Index Operations"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
git-
m
erge-ou
r
s
: make
s
u
r
e
o
ur i
n
dex mat
c
hes HEAD
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C
H
am
a
no
A
d
d 'ours' mer
g
e
strate
g
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Add
-
-no
-
commit 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 --si
n
ce an
d
-
-until
opt
i
ons to rev-
p
arse
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Juni
o
C
Hamano
Be carefu
l
w
h
e
n
dereferencing ta
g
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Peter Erik
s
en
[
P
ATCH] Clean
up the SunO
S
Makefi
l
e rule
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio
C
Hama
n
o
Ignore '\r' at
t
h
e
end
o
f
line in $GIT_DIR/confi
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Alex R
i
esen
remove CR/LF f
r
om
.
gitignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Do not
fail on hierarchical branch
names
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Ha
m
a
n
o
Make te
s
t-date bu
i
ldable again
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Junio C
H
amano
git-clo
n
e: do not forget to create
origin branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Junio C Hamano
D
o
not put automati
c
merge mess
a
ge
a
fte
r
signed-of
f
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
J
u
n
i
o C
H
amano
A
dd -P to the documentat
i
o
n
head
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Martin Langhoff
c
v
simport: cv
s
ps sho
u
ld be quiet too
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Martin
L
a
nghoff
cvsimport: in
t
roduce -P <cvsp
s
-ou
t
p
u
t
-file> option
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Martin Langhoff
c
v
s
impo
r
t:
c
atch erro
r
condition where cvs host disappears
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Juni
o
C H
a
mano
D
o
n
o
t
inst
a
ll backward
c
ompatibility
l
ink
s
anymor
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-01
Jo
s
e
f We
i
d
en
d
orfer
Strip any trailing sla
s
h
on des
t
i
nation argu
m
e
n
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-01
Petr Baudis
git-a
m
.
tx
t
is no
s
tu
b
any
m
o
r
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-01
Petr Baudis
Docu
m
entat
i
on fo
r
g
it-fmt-merge-msg
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-01
Petr Baudis
Remov
e
git-find
t
ags
.
perl
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-01
Jon
L
oe
l
iger
Remove 'Previously this
c
o
mman
d
was known as
.
.
.
' messages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-01
Jun
i
o C H
a
man
o
Fix constness of input in mozill
a
-sha1/sha1
.
c::SHA1
_
Upda
t
e()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-01
Junio C H
a
mano
Documen
t
t
he u
s
e
of "current dir
e
ctory" as pull source
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Linus Torvalds
Add
e
xa
m
ples for
g
i
t
-
log documentation and o
t
her
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Junio C Hamano
Work around an
R
PM b
u
ild
prob
l
em
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Junio
C
H
a
m
a
no
Fix rev-li
s
t docum
e
n
tation aga
i
n (-
-
spar
s
e
and pathspec)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
J
u
n
io C Haman
o
U
p
dat
e
git-pack-ob
j
ects documen
t
ation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Juni
o
C Hamano
Update gi
t
-
r
ev-list opt
i
ons lis
t
i
n rev-
p
arse
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
J
uni
o
C Hamano
Update
usage string and documen
t
ation f
o
r
git-rev-li
s
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Ch
r
is Shoe
m
aker
Add
to
usa
g
e
and docs for
g
it-add
.
s
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
C
h
ris
Sho
e
m
a
ker
Add to
documen
t
at
i
o
n
of git-up
d
ate-ind
e
x
a
r
gume
n
ts
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Chris S
h
oemak
e
r
Add u
s
age
s
tatemen
t
to git
-
checkout
.
sh
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Junio C Hamano
G
I
T
0
.
99
.
9 master bran
c
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Junio C Ha
m
ano
GIT 0
.
99
.
9
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next