repo.or.cz
/
debian-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Add 'ours' merge strategy.
2005-11-03
J
unio C H
a
m
a
no
A
d
d '
o
ur
s
' me
r
ge
s
tra
t
e
gy
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
J
u
nio C H
a
mano
Ad
d
--no-com
m
it to
git-
m
er
g
e/git
-
pull
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Ham
a
no
Do
c
u
ment --s
i
nce and --unti
l
options
to rev-parse
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
J
u
nio C Haman
o
Be careful when
de
r
efer
e
ncing tags
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
J
u
nio C Hamano
Ig
n
ore '\r' at
t
h
e
end of line in $GIT_D
I
R/conf
i
g
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
J
unio C Hamano
Do
not fail on hierarchical
branch names
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Juni
o
C
Ha
m
an
o
M
ake test-date
b
uildable again
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
Junio C Hamano
gi
t
-clone: do no
t
forg
e
t to cre
a
te o
r
igin branch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
Juni
o
C Hamano
D
o
n
ot put automati
c
merge message after sig
n
e
d-off
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
Jun
i
o C
H
amano
Ad
d
-P t
o
the documentati
o
n
head
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
Junio C
Hamano
Do not
install
backw
a
rd comp
a
tibili
t
y links anymo
r
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-01
J
u
n
i
o C Hama
n
o
Fix constness of inp
u
t in mozilla-sha1/sha
1
.
c
::SHA1_Update
(
)
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-01
Junio C Hamano
Do
c
ument
t
he use of "c
u
rrent direc
t
ory" as pull sour
c
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Junio
C
H
amano
Work ar
o
und an RPM build pr
o
blem
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Junio C Haman
o
Fix rev-list document
a
t
ion ag
a
in (--sparse
and
p
athsp
e
c
)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Junio C
Hamano
Upd
a
te
g
it-pack-obj
e
cts documentation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Ju
n
io C Hamano
U
pdate git-
r
e
v
-
l
i
st
o
ptions list in rev-parse
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
J
u
nio C Hama
n
o
Updat
e
usage string a
n
d doc
u
m
entat
i
on for git-rev-li
s
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Junio C Ham
a
no
GIT 0
.
99
.
9
m
aster branch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
J
un
i
o
C
Hama
n
o
GIT
0
.
9
9
.
9
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
J
unio C Ha
m
ano
Docu
m
entation updates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Junio C Ham
a
no
Do n
o
t mmap-c
o
py the who
l
e thing; j
u
st use copy_
f
d()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Jun
i
o C Ham
a
no
T
each local-fetch about lazy object directories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Junio C Hamano
Fix re
c
en
t
docume
n
tati
o
n format breakage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Junio
C
Ham
a
no
git-apply --numstat
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-28
Junio C Hamano
Document 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 bran
c
h
'js-
f
a
t
'
commit
|
commitdiff
|
tree
2005-10-27
Juni
o
C H
a
m
a
no
Merge branch
'lt-dense'
commit
|
commitdiff
|
tree
2005-10-27
Junio C Hamano
M
e
rge ht
t
p://www
.
kern
e
l
.
org/pub/scm
/
gitk
/
gitk
commit
|
commitdiff
|
tree
2005-10-26
Junio
C
Hama
n
o
pack-objects:
Allow use o
f
pre-genera
t
ed pack
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-26
Junio C Haman
o
upload-
p
a
c
k: tig
h
ten request
va
l
ida
t
io
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-26
Junio C Hamano
Add [v]iew
p
atch in git-am interactive
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-26
J
unio
C
Hamano
git
-
am: mak
e
it eas
i
er after fi
x
i
ng up an
u
nappli
c
abl
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-25
Ju
n
io C
H
a
m
a
no
Revert recent fetch-pack/upload-pack updates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-24
Junio C Ha
m
ano
up
l
oa
d
-pack: fi
x
thinko in com
m
on-
c
ommit
f
inder
code
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-24
Junio C Haman
o
Cl
a
ri
f
y gi
t
st
a
tu
s
output
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-23
Junio C Ha
m
an
o
Merge branch 'fixes'
commit
|
commitdiff
|
tree
2005-10-23
Junio C Ha
m
ano
git-show-bran
c
h: Fi
x
o
f
f-by-one err
o
r
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-22
Junio
C
Hamano
All
o
w git
-
merg
e
not to commit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-22
Ju
n
io C Ha
m
ano
up
l
oad-pack:
Increase
MAX_HAS
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-22
Juni
o
C Haman
o
F
ix
m
a
lformatted
git-am documentati
o
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-21
Junio
C
Hamano
Merge branch 'fixes
'
commit
|
commitdiff
|
tree
2005-10-21
Junio C Hamano
dae
m
on
.
c: remove t
r
ailing whitespac
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-21
Junio
C
Hama
n
o
F
in
i
sh git-am doc
u
mentation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-21
J
u
nio C
Hamano
Fix mi
s
sing exports
i
n gi
t
-am
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-20
J
u
n
i
o C Hamano
Ma
k
e
s
ure we barf on ref^{type} fa
i
lure
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-20
Junio C Hamano
Be mo
r
e careful tangling obj
e
ct ch
a
ins while marki
n
g
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-20
Junio C Haman
o
git-fetch/push/pull
:
documen
t
ation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-20
Junio
C Hamano
D
o
n
ot feed r
e
v-
l
ist
an inv
a
lid SHA1 expression
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-19
Junio
C Hamano
count-
o
bjects: squel
c
h error from find on
s
par
s
e object
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-19
Junio C
Hamano
gi
t
-cl
o
ne:
a
lway
s
keep p
a
ck se
n
t
fr
o
m remote (docume
n
tation)
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-19
Junio C H
a
mano
git
-
clone: always keep pack
s
e
nt from remo
t
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-19
Jun
i
o C Hamano
Do n
o
t ask for objects
k
nown to be co
m
plete
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-19
Junio C Hamano
Do not ask for objects
known to
b
e complete
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-19
Jun
i
o
C
H
amano
Eve
n
when
o
verwriting tags,
r
eport if they ar
e
ch
a
nged
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
Junio C Ham
a
no
Remove unused
incl
u
de
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
Jun
i
o C Hamano
git-checkout: revert specific p
a
t
h
s to either
i
ndex
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
Ju
n
i
o C Haman
o
T
e
ach g
i
t-add and g
i
t-
c
ommit to handle
filenames
s
tarti
n
g
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
Junio C
Ha
m
ano
Fo
r
war
d
port the
"f
u
nny ref a
v
oidan
c
e" in clone and
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
Juni
o
C Hamano
Adjust test
s
for not quoting
S
P
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
Junio C H
a
mano
Do no
t
quote
S
P
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
Junio C Hamano
gi
t
-apply:
r
emove unused --
s
how-files f
l
a
g
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
J
u
nio C Hamano
update
-
index --index-info:
ad
j
ust for funny-p
a
t
h
q
uot
i
ng
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
J
uni
o
C
Hamano
Add tests for funny
p
athnam
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
Junio C Hamano
Update documenta
t
ion for C-style quoting
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
Junio C Hamano
Up
d
ate gi
t
-status to new git-diff-* and git-ls-files
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
Jun
i
o C Hamano
Upd
a
te
gi
t
-diff-* to use C-sty
l
e quoting
f
or funny
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
Junio C Hamano
Improve "git ad
d
" again
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
Junio C Ham
a
no
Up
d
ate ls-files a
n
d ls-t
r
ee
t
o us
e
C-styl
e
q
u
otin
g
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
Junio C Hamano
Update
g
it-apply to use C
-
style quot
i
ng for
f
u
n
ny pathnames
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
Jun
i
o
C Hamano
Func
t
i
on
s
to
q
uote and u
n
q
u
o
te
pathnames
i
n C-style
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
Junio C Hamano
Mer
g
e branch
'
fixes'
commit
|
commitdiff
|
tree
2005-10-18
Junio C
H
aman
o
git-checkout-in
d
ex: documentation
u
p
dates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-17
Junio C H
a
ma
n
o
ref-format
d
ocume
n
tation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-16
Junio C
Haman
o
Spar
s
e-directory
safe
t
y
fix
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-16
Ju
n
io
C H
a
mano
M
e
rge br
a
nch
'fixe
s
'
commit
|
commitdiff
|
tree
2005-10-16
Junio C
H
amano
We do
n
o
t
depend on p
a
tch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-16
J
unio C Ham
a
no
Merg
e
b
r
anch 'svn' of http://ne
t
z
.
smu
r
f
.
noris
.
de/git/git
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-16
Junio C Ha
m
ano
Sq
u
elch
c
ompiler w
a
rnings from con
n
ect
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-16
Jun
i
o C Hamano
Disable hoo
k
s
durin
g
tests
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-16
J
unio C Hamano
w
h
at
c
hanged: d
o
cu
m
ent -m opti
o
n f
r
om git-diff-tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-15
Juni
o
C
Hama
n
o
Sh
o
w peeled onion from
u
pload-pack and server-info
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-15
Junio
C
Ha
m
a
n
o
Introduce
n
otation "ref^{type}"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-15
Jun
i
o C Hamano
I
g
n
or
e
fun
n
y
refname se
n
t fr
o
m remot
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-15
Ju
n
io C Hamano
Refuse
t
o
c
reate
f
unny refs in clone-pack, g
i
t-fetch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-15
J
u
n
io C Hamano
git-check-ref-format: rej
e
c
t
fun
n
y
ref nam
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-15
Junio C H
a
mano
Merge branch
'
fixes'
commit
|
commitdiff
|
tree
2005-10-15
Junio C Hamano
Sh
o
w curl error a
b
it better
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-14
Junio C Hamano
f
ormat-pat
c
h: take seque
n
c
e
of
r
a
nges
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-13
Junio C Hamano
t
u
toria
l
: update the initial
c
ommit exam
p
le
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-13
Junio C Ha
m
ano
git-am: do not fail if
3
-wa
y
fall
b
ack
succeeds
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-13
Junio C Hama
n
o
clone-pack: new
o
ption --k
e
ep te
l
ls it
not to explode
.
.
.
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
clone-pack
:
new option --keep
t
ells it not to explode
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-13
J
u
nio C Haman
o
Fix
p
ackname hash ge
n
era
t
ion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-13
J
u
nio C Hamano
g
it-am: in
t
e
r
ac
t
i
v
e should fail
g
racef
u
l
ly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-12
Jun
i
o C Hamano
g
it-fe
t
ch --tag
s
: deal with t
a
g
s wi
t
h spaces in
t
hem
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-12
Junio C H
a
mano
Quot
e
reference
n
a
m
es
while fetching with
c
url
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-12
Junio C Haman
o
Merge
branch 'fix
e
s'
commit
|
commitdiff
|
tree
2005-10-12
Junio C Hamano
Use
c
o
re
.
filemode
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-11
Junio C Ha
m
an
o
s
h
ow-branch: op
t
ionally use
u
nique prefi
x
as na
m
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next