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 and -pull: describe
merge strategies
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-04
Ju
n
io C Hama
n
o
Documenta
t
ion: git
-
add -- do
not say "cache"
,
a
d
d
e
x
ampl
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-04
J
u
n
i
o
C Hama
n
o
g
i
t-tag:
D
o
not assume the
working t
r
ee roo
t
is
w
ritable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Haman
o
Illustr
a
t
ion: "Commit DAG Revisi
o
n Naming"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Il
l
ustration: "G
i
t Diff Types"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Illustration: "F
u
ndamental Git Ind
e
x
Operatio
n
s"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Jun
i
o
C
H
a
mano
git-merge-o
u
rs: m
a
k
e sure
our ind
e
x matches HEAD
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio
C
H
amano
Add
'
o
urs'
mer
g
e str
a
t
e
g
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Haman
o
Add --no-commi
t
to gi
t
-
m
erge/git-pull
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Document --s
i
nce and --until optio
n
s
t
o rev
-
parse
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C
H
amano
Be care
f
ul when dereferenc
i
n
g
t
ags
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hama
n
o
I
gnore '
\
r' at the end of
l
ine i
n
$GIT_DIR/config
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Do
n
o
t fail on hierar
c
hi
c
al
b
r
anch names
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C
H
ama
n
o
Ma
k
e te
s
t
-date buildable again
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
Junio C Hamano
git-clone: do not f
o
rget to create origin br
a
nch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
Junio C
Ha
m
a
n
o
Do not put automat
i
c merge messag
e
af
t
er signed-
o
ff
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
J
u
nio C
H
a
mano
Add -P
to
the docume
n
tation he
a
d
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
Junio C
Hamano
Do n
o
t install
b
a
c
kward c
o
mpatibility links any
m
ore
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-01
Junio C Hama
n
o
Fix constne
s
s of
input in mozilla-sha1/sha1
.
c::SH
A
1_U
p
date
(
)
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-01
Junio C Haman
o
Document the use of "current
d
irectory
"
as pull
s
ource
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Junio C Hamano
Work ar
o
un
d
an RPM build pr
o
b
lem
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
J
unio C
Ham
a
no
F
ix rev-list documentation again (--sparse and pathspec)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Junio C Ha
m
ano
U
p
d
ate git
-
pack-objects documentation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Junio C Hamano
Update git-rev-list optio
n
s lis
t
i
n
rev-
p
ar
s
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Junio C H
a
mano
Update u
s
a
ge st
r
ing and docu
m
entation for g
i
t
-
rev
-
l
is
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
J
u
nio
C Hamano
GIT
0
.
99
.
9 master branch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Junio C Hamano
G
IT 0
.
99
.
9
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Junio C Haman
o
Doc
u
mentation
up
d
ates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Junio C Hamano
Do not mm
a
p
-
co
p
y the w
h
ole thin
g
; just use copy_fd()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Junio C Hamano
T
e
ach local-fetch about
l
azy object directori
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Junio C
H
am
a
no
F
i
x recent docu
m
entation forma
t
bre
a
kage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Ju
n
io C Ha
m
ano
git-apply --numstat
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-28
Ju
n
i
o
C Hamano
Doc
u
ment git-patch-id
a
bit better
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-27
Junio C
Hamano
Merge branch 'js-fa
t
'
commit
|
commitdiff
|
tree
2005-10-27
Junio C Haman
o
Me
r
ge branch 'lt-den
s
e'
commit
|
commitdiff
|
tree
2005-10-27
Junio C Hamano
Merge http://www
.
kernel
.
o
r
g/pub/scm/g
i
tk/gitk
commit
|
commitdiff
|
tree
2005-10-26
Junio C
Hamano
p
ack-objec
t
s: Allow
use of pre-gene
r
ated pack
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-26
J
unio C Hamano
upl
o
ad-
p
ack: tighten r
e
quest
valid
a
tion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-26
Jun
i
o C Ha
m
ano
Add
[
v]ie
w
p
a
t
ch in g
i
t-am inte
r
active
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-26
Junio C Hamano
git-am: mak
e
i
t e
a
sier
a
fter fixing
u
p an unapplica
b
le
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-25
Junio C Hamano
Re
v
ert recent fetch-pack/
u
pload-
p
a
ck updates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-24
Jun
i
o C Hamano
upload-pack
:
fix thinko in com
m
on
-
c
o
mmit
fi
n
der code
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-24
Ju
n
i
o C Hamano
Clarif
y
g
it
status output
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-23
Junio C Hamano
Merge branch 'f
i
x
e
s
'
commit
|
commitdiff
|
tree
2005-10-23
Ju
n
io C Hamano
git-show-branch:
F
ix off-by-one er
r
or
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-22
Junio C Hama
n
o
Allow git
-
merge not t
o
com
m
i
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-22
Ju
n
io C Hamano
upload-pa
c
k: Increas
e
M
AX_HAS
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-22
J
u
nio C
H
am
a
no
Fix
m
alfor
m
a
t
ted git-am documentation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-21
Junio C
Haman
o
Mer
g
e branch 'fixes'
commit
|
commitdiff
|
tree
2005-10-21
Junio C Hamano
daemon
.
c: remove trai
l
ing whitespace
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-21
Junio C Hamano
Fini
s
h git
-
am
do
c
ument
a
tion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-21
Junio C Haman
o
Fix miss
i
ng e
x
p
o
rts in g
i
t
-am
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-20
Juni
o
C
H
a
m
ano
Make sure
we
b
arf on ref^{type}
f
ailure
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-20
Jun
i
o C Hamano
Be m
o
r
e
c
a
reful
tangling object
c
hains
w
hile
marking
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-20
Junio C Hamano
g
i
t-f
e
tch/push/pull: documentation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-20
Junio C
Ha
m
a
n
o
Do
not fee
d
r
e
v
-lis
t
an inv
a
lid
SHA1 expression
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-19
Junio C
H
a
man
o
c
ount-o
b
jec
t
s:
s
quelch e
r
ror from find on
sparse obj
e
ct
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-19
Junio C H
a
mano
git-clone: always
k
eep pack sent f
r
o
m
remote (documentation)
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-19
Junio
C
Hamano
git-clone:
alwa
y
s keep p
a
ck sent fro
m
remot
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-19
Junio
C
Hamano
Do not ask
for objects known
t
o
b
e complete
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-19
J
u
nio C
Hamano
Do not ask fo
r
object
s
kn
o
wn to b
e
co
m
plete
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-19
Junio C Hamano
E
v
en when
overwr
i
ting
t
ags,
report if
t
h
e
y
are chan
g
e
d
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
Junio C Ha
m
an
o
Remove unused i
n
cl
u
de
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
Junio
C Hamano
g
it
-
checko
u
t: revert spe
c
ific paths to either ind
e
x
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
Junio C Hamano
Teach g
i
t
-
ad
d
and git-commit to handle filenames sta
r
ting
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
Juni
o
C Hamano
F
o
r
ward port the "funny re
f
avoidance" in clone
a
nd
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
Junio
C H
a
mano
Adjust tests fo
r
not quoting SP
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
Junio
C Hamano
Do not q
u
ote SP
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
Juni
o
C H
a
man
o
git-ap
p
ly: remove
u
n
u
sed
-
-
s
how-fil
e
s flag
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
Jun
i
o C Hamano
updat
e
-index
-
-index-info: ad
j
ust
f
or
funny-path quoti
n
g
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
Junio C Haman
o
Add tes
t
s
f
o
r funny pathnames
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
Juni
o
C Haman
o
Update documentation for C
-
style qu
o
ting
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
J
u
nio C Ham
a
no
U
p
date git-sta
t
us to new git-
d
iff-* and git-ls-file
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
Junio
C
H
amano
Update git-d
i
ff-* to use C-style quoting for funny
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
Junio C Hamano
Impro
v
e
"g
i
t add" again
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
J
u
n
io C Hama
n
o
Update ls-files and
l
s
-
t
ree to use C-
s
t
y
le qu
o
tin
g
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
Junio C Hamano
Update git-apply to use C-style quoting
f
o
r
funny pat
h
names
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
Junio C Hamano
Functio
n
s to quote
and unqu
o
te pathnames i
n
C-style
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
J
u
nio C Hamano
Merge branc
h
'fixes'
commit
|
commitdiff
|
tree
2005-10-18
Junio C Hamano
gi
t
-c
h
eckout
-
index: docu
m
entation updates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-17
Junio
C Hamano
ref-
f
ormat documentati
o
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-16
Junio C H
a
m
a
no
Sp
a
rse-
d
i
rectory safety fix
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-16
Jun
i
o C Ham
a
n
o
Merge br
a
n
ch
'fix
e
s'
commit
|
commitdiff
|
tree
2005-10-16
Junio C Hamano
We do not depend on pa
t
c
h
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-16
J
u
nio
C
H
a
ma
n
o
Merge branch 'svn' of http://netz
.
smurf
.
n
o
r
i
s
.
de
/
git/git
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-16
Junio C Hamano
S
q
ue
l
ch compi
l
e
r
warnings from connect
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-16
Junio
C
Hamano
Disable
hooks during
t
e
sts
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-16
Junio
C H
a
mano
whatch
a
nged: docum
e
nt -m option fro
m
git-diff-tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-15
Ju
n
io C
H
amano
Show peeled
o
nion fro
m
u
p
l
oad-
p
ack and server
-
info
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-15
Junio C
H
am
a
no
Introd
u
c
e nota
t
io
n
"r
e
f^{type}"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-15
Junio C Hamano
I
g
no
r
e f
u
nny ref
n
am
e
sent from rem
o
t
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-15
Junio C
Hamano
Refuse to create funny refs
i
n
clone-pack,
g
it-fet
c
h
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-15
Junio C H
a
m
a
n
o
git-che
c
k-
r
e
f-
f
ormat: reje
c
t funny r
e
f
n
a
mes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-15
Junio C Hamano
Merge bran
c
h 'fixe
s
'
commit
|
commitdiff
|
tree
2005-10-15
Junio C Hama
n
o
Sh
o
w curl error a bit better
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-14
Junio C Hamano
f
o
rmat-patch: take sequence of r
a
nges
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-13
Junio C
Hamano
tu
t
orial: up
d
a
t
e the init
i
al com
m
i
t example
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-13
J
u
nio C
H
ama
n
o
git-am
:
do not
f
a
i
l
if 3-way fallback succeeds
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-13
Junio
C Ha
m
ano
clone-pa
c
k: n
e
w o
p
t
ion --keep
tells it no
t
to exp
l
ode
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-13
Junio C Hamano
c
l
o
ne-pac
k
: new opti
o
n
-
-keep tell
s
it not t
o
explode
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next