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
Documentation: -merge and -pull: describe merge strategies.
2005-11-04
Junio C Hamano
D
o
cumentation: -merge
a
n
d -pull:
describ
e
merge s
t
rategi
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
J
u
ni
o
C Hamano
Docu
m
entation: git-ad
d
--
d
o not say "cache", add examples
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
Juni
o
C Hamano
git
-
tag: Do not a
s
sume th
e
workin
g
tree root i
s
writa
b
l
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Ill
u
stratio
n
: "
C
ommit
DAG Revi
s
ion
N
amin
g
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
J
unio C
H
amano
Illustration: "Git Diff T
y
pes"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Illustratio
n
: "Fundamental Git Index
O
perations"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Haman
o
git
-
m
e
rge-o
u
rs: make sure our index matches HEAD
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio
C
H
a
m
a
no
Add 'o
u
rs' merge strate
g
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Add --no-
c
o
mmit
to git
-
merge
/
git-pull
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Ham
a
no
Document --si
n
ce
and --until options
t
o rev-p
a
rse
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Ham
a
no
Be careful when d
e
r
e
ferencing tags
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Haman
o
I
gnore '\
r
' at th
e
e
n
d
o
f line in $GIT_DIR
/
config
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
J
u
n
io C H
a
mano
Do not f
a
il
o
n hierarchi
c
al bran
c
h names
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
J
u
nio C Hama
n
o
Mak
e
test-d
a
te buildable again
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Junio C Hama
n
o
git-cl
o
ne: do not forget to create origi
n
branc
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Junio C H
a
man
o
D
o not put
a
u
tomatic merge message after signed-off
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Junio C Hamano
Add -P to the documentati
o
n head
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Jun
i
o C H
a
mano
Do not install b
a
ck
w
ard c
o
mpatibility li
n
ks
an
y
m
ore
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-01
Ju
n
io
C Ham
a
no
F
i
x constness of
input in mozi
l
la-sha1/s
h
a
1
.
c::SHA1_Update(
)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-01
Junio C Haman
o
Document the us
e
of "curren
t
directory" as pull source
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Junio C Hamano
Work around an RPM build pro
b
lem
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Junio C
H
amano
Fix rev-l
i
st doc
u
men
t
a
t
i
on again (--sparse and pat
h
spe
c
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Junio C
H
a
m
ano
Update
g
it-pack-objects document
a
t
ion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Junio C Hamano
Upda
t
e git-re
v
-list
opti
o
ns lis
t
i
n rev-parse
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Jun
i
o C H
a
mano
Upd
a
te
usage st
r
ing an
d
do
c
ument
a
tion for git-r
e
v-list
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Juni
o
C
Haman
o
GI
T
0
.
99
.
9 master branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Junio C
H
amano
GIT
0
.
9
9
.
9
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
J
unio C
H
a
mano
D
o
cumentation u
p
dates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Junio
C
H
amano
Do not mm
a
p-copy
t
h
e whole thing; just use copy_fd()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Jun
i
o C
H
amano
Tea
c
h local-fe
t
ch abou
t
laz
y
o
bject di
r
ector
i
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Junio C
H
amano
F
ix r
e
cent documentatio
n
f
o
rmat
breakage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Junio
C
H
a
mano
git-apply --num
s
tat
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-28
Junio C H
a
man
o
Docu
m
ent git-p
a
tc
h
-id a
b
it be
t
ter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-27
Juni
o
C Ha
m
a
n
o
M
erge branch 'js-fat'
commit
|
commitdiff
|
tree
2005-10-27
Junio
C
Hamano
Merg
e
b
ranch 'lt-den
s
e'
commit
|
commitdiff
|
tree
2005-10-27
Jun
i
o C Hamano
M
e
rge
h
ttp://www
.
kernel
.
org/pub/
s
cm/g
i
tk/gitk
commit
|
commitdiff
|
tree
2005-10-26
Junio C Hamano
pack-objects: Allow use
of pre-generated
pack
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-26
Ju
n
i
o C Hama
n
o
upload
-
pack: ti
g
hten request validati
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-26
Junio C Hamano
Add [v]iew patch
in git-am i
n
t
e
ractive
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-26
Junio C Hamano
git-am: make it easier after
f
ixing up an unapplicab
l
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-25
Jun
i
o C Ha
m
ano
R
e
vert rec
e
nt fe
t
ch
-
pac
k
/upl
o
a
d
-
pack
u
p
d
ates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-24
Junio C Hamano
upload-pa
c
k: fix thi
n
k
o in co
m
mon-commit
f
ind
e
r c
o
de
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-24
Juni
o
C Ha
m
ano
Clarify gi
t
status
o
utpu
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-23
Junio C H
a
mano
Me
r
ge branch
'fi
x
es'
commit
|
commitdiff
|
tree
2005-10-23
Junio C Hamano
git-s
h
ow-branch: Fix off-by
-
one error
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-22
Junio
C
H
a
man
o
A
llow git-merge not to
commi
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-22
Jun
i
o
C
Hamano
upload-pack: Incre
a
se
MAX_HAS
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-22
Jun
i
o C Ha
m
an
o
Fi
x
malformatted git-am
d
ocume
n
tatio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-21
Junio
C Ham
a
n
o
Merge branch 'fixes'
commit
|
commitdiff
|
tree
2005-10-21
J
unio C Hamano
dae
m
on
.
c: remove trailing whitespace
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-21
Juni
o
C
Hamano
Finish git-am documentation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-21
Junio C Hamano
Fix missing
e
xpor
t
s
i
n git-am
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-21
J
u
nio C Hamano
Me
r
ge /pub/
s
cm/git/git to
r
ecover lost
s
ide
branch
Signed-off-by:
Junio C Hamano
<junio@hera.kernel.org>
commit
|
commitdiff
|
tree
2005-10-20
Juni
o
C Hama
n
o
M
a
ke s
u
re we barf on ref^{typ
e
} fail
u
re
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-20
J
u
nio C Hamano
B
e
m
ore
c
areful tanglin
g
o
bject
c
h
a
ins while mar
k
i
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-20
Jun
i
o C
H
amano
git-fetch/push/pull
:
docum
e
ntation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-20
Ju
n
io C Hama
n
o
Do no
t
f
e
ed rev-list an invalid SHA1 expression
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-19
Junio C
Ha
m
ano
count
-
objects: squelch error from find o
n
spar
s
e object
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-19
Juni
o
C Hamano
git-clone: alway
s
ke
e
p pack
sen
t
f
rom remo
t
e (documentation)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-19
J
unio C Hamano
g
i
t-cl
o
ne: always keep pack sent from re
m
ote
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-19
Junio C Hamano
Do not a
s
k
f
or
o
bjects kn
o
w
n
t
o
b
e
complete
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-19
J
u
nio C Haman
o
Do not ask for ob
j
ects known to be comp
l
ete
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-19
J
uni
o
C Hamano
Even when
o
verwriting
t
a
g
s, report if t
h
e
y
are changed
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-18
Junio C
H
amano
Re
m
ove unused include
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-18
Jun
i
o
C Hama
n
o
git-c
h
ec
k
o
ut: revert
specif
i
c paths to
either index
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-18
Ju
n
io C Ham
a
n
o
T
e
a
ch git-add and git-com
m
it to ha
n
dle fil
e
n
a
mes starting
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-18
Junio C H
a
mano
F
o
rw
a
r
d
por
t
t
h
e
"fun
n
y ref avoidance
"
in clone and
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-18
Junio C Hama
n
o
Ad
j
ust tests
f
o
r n
o
t quoti
n
g
SP
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-18
Jun
i
o C Hamano
D
o
n
ot quote
SP
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-18
Junio
C Hamano
git-
a
pply:
remov
e
unused --show-files flag
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-18
Junio C H
a
mano
upda
t
e
-index --index-inf
o
: adjust for funny-pa
t
h
quoting
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-18
Jun
i
o C H
a
m
a
n
o
Add
tests for funny pa
t
hna
m
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-18
Junio C Hamano
Update doc
u
men
t
ation for C-
s
tyl
e
quo
t
ing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-18
Junio C
H
amano
Update gi
t
-
s
t
atus
t
o
n
ew git-diff-*
a
n
d git-ls-files
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-18
Junio C Ha
m
a
n
o
U
pdate git-dif
f
-* to us
e
C-style quoting
for funny
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-18
J
u
nio C Hamano
Improv
e
"
g
it
a
dd" again
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-18
Junio C Hamano
U
p
date ls-fil
e
s
and l
s
-
tree to
u
s
e C-style quoting
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-18
Junio C Hamano
Update git-apply to use C-sty
l
e
q
uoting for funny
p
athnames
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-18
Junio C Haman
o
Fu
n
cti
o
ns to quote and unquo
t
e pa
t
h
names in C-style
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-18
Junio
C
Ham
a
no
Merg
e
b
ran
c
h 'fi
x
es
'
commit
|
commitdiff
|
tree
2005-10-18
J
unio C
Hamano
git-checkout-index: documentation up
d
ates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-17
Ju
n
io
C Hamano
ref-format docume
n
t
a
t
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-16
Junio C H
a
man
o
Sparse-dire
c
tory safety fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-16
Jun
i
o C Hamano
Merge branc
h
'
f
i
xes'
commit
|
commitdiff
|
tree
2005-10-16
Junio C Hamano
We d
o
not depen
d
on patch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-16
J
unio
C
Hamano
Merge branch 'svn' of http://netz
.
sm
u
rf
.
n
o
ris
.
de/git/
g
it
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-16
Junio
C Hamano
Squelch c
o
mpiler wa
r
nings from conne
c
t
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-16
Ju
n
i
o
C Hamano
D
isable hooks duri
n
g tests
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-16
Junio C Hamano
whatch
a
n
g
ed:
document
-
m optio
n
from git-diff-tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-15
Ju
n
io C H
a
mano
Show
p
eeled o
n
ion
f
rom u
p
load-pack and
s
e
rver-info
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-15
Junio C
H
amano
In
t
r
o
duce notation "ref^{type}"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-15
J
u
n
io C
H
amano
Ig
n
o
r
e funny
r
efname sent
f
r
om rem
o
te
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-15
Junio C Hama
n
o
Ref
u
se to create fu
n
n
y refs in clone-pack, gi
t
-fetc
h
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-15
Ju
n
io C Hamano
git-check-
r
ef-f
o
rmat:
r
eject funny ref names
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-15
J
unio C
Hamano
Merg
e
branch 'fixes'
commit
|
commitdiff
|
tree
2005-10-15
Junio
C Ham
a
no
S
h
ow c
u
rl error a bit better
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-14
Junio
C Hamano
format-
p
a
tc
h
: take seq
u
ence of r
a
nges
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-13
Junio C Ha
m
ano
tutorial: update the i
n
i
t
i
a
l commit
e
xample
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-13
Junio C Hamano
git-am:
d
o no
t
fail
if 3
-
way f
a
llback
succeeds
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-13
Junio C Ha
m
ano
c
lone-pa
c
k
:
new
optio
n
--keep tells it
not to
explod
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next