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
git-merge-ours: make sure our index matches HEAD
2005-11-03
Jun
i
o C Hama
n
o
git-mer
g
e
-ours: mak
e
sure ou
r
index matches HEAD
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Ha
m
ano
Add 'ours' merge strat
e
gy
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Ju
n
io C Hamano
Add --no-
c
ommit to
g
it-m
e
r
ge/g
i
t
-
pull
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
J
u
ni
o
C Hamano
Docu
m
ent --s
i
nce an
d
--until opti
o
ns to r
e
v-parse
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Jun
i
o
C
Ha
m
ano
Be careful when
de
r
eferencing tags
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Ignore '\r' a
t
the end
o
f line in $GIT_
D
IR/config
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C
H
a
m
ano
D
o
not fail
o
n hierar
c
hical branch names
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-03
Junio C
Hamano
Make t
e
s
t
-date buildable again
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
J
unio C Haman
o
git-
c
lo
n
e: do not forget t
o
creat
e
origin branch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
J
u
n
i
o
C Ha
m
ano
Do
not put au
t
omatic merge
mes
s
age a
f
ter signed-off
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
Jun
i
o
C
H
amano
Add -P to the do
c
umentation head
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-02
Junio C Hamano
Do n
o
t insta
l
l backward
compat
i
b
il
i
ty links
a
nymore
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-01
Ju
n
io
C Hamano
Fix constness of
i
nput in mozi
l
la-sha1/sha1
.
c::SHA1_Update()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-01
J
unio C Hamano
Do
c
ument the use of "
c
u
r
rent directory" as pull sour
c
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Junio C
Haman
o
Work a
r
ound an RPM bu
i
ld problem
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Jun
i
o
C Hamano
Fix r
e
v
-
list d
o
cumentation again (--s
p
arse and pathspe
c
)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Junio C
H
a
m
ano
Update git-pack-objects documen
t
a
t
i
o
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Junio
C Hamano
U
p
date git-rev-
l
i
st
o
pti
o
ns
li
s
t
i
n
rev-parse
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Junio C Hamano
U
p
date usa
g
e string an
d
documentati
o
n for git-r
e
v-li
s
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-31
Junio C Hamano
GIT 0
.
9
9
.
9 mast
e
r
b
ran
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
2005-10-29
Ju
n
io C
H
a
m
ano
Documentation
u
pdates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
J
unio
C
Hamano
Do not m
m
a
p
-copy the whole
t
h
ing; just use co
p
y_fd()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Junio C Ha
m
ano
T
ea
c
h local-fetch about laz
y
object direct
o
r
ies
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Junio
C H
a
mano
Fix
rece
n
t documentation format b
r
eakage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-29
Jun
i
o C Haman
o
git-apply
-
-
n
umst
a
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-28
Junio C H
a
mano
Document git-patch-i
d
a bit b
e
tt
e
r
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-27
Junio C Ha
m
ano
Merge branch 'js-
f
at
'
commit
|
commitdiff
|
tree
2005-10-27
J
u
n
io C Hamano
M
e
rge branc
h
'lt-dense'
commit
|
commitdiff
|
tree
2005-10-27
Junio C Hamano
Merge http:/
/
www
.
ke
r
nel
.
o
r
g/pub/scm/gitk/g
i
tk
commit
|
commitdiff
|
tree
2005-10-26
Junio C
H
amano
pack-obj
e
cts: Allow use of pre-generated pack
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-26
Junio C Hamano
upload-p
a
c
k
: tighten request validation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-26
Junio C Hamano
A
d
d
[v]
i
ew
patch in git
-
am in
t
eractive
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-26
Junio C
H
a
m
a
no
git
-
am
:
m
a
ke it easier a
f
ter fixing up an unapplic
a
ble
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-25
Juni
o
C
H
a
mano
Revert recent fetch-pack/upload-pack upda
t
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-24
Junio C Hamano
u
p
load-
p
ack:
f
ix th
i
nko in common-commit finder code
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-24
Juni
o
C Hamano
Clarify git status
output
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-23
Ju
n
io C Haman
o
Merge bra
n
c
h
'
f
i
x
es'
commit
|
commitdiff
|
tree
2005-10-23
Junio C Hamano
git
-
show-bran
c
h: Fix off-by-one
e
rror
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-22
Junio
C
Hamano
Al
l
o
w
g
it-merge
not
to
co
m
mit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-22
Junio C Hamano
uploa
d
-pack: Increa
s
e M
A
X_HAS
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-22
Junio C
H
amano
Fix
malformatted g
i
t-am documentation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-21
J
unio C Ham
a
n
o
Merge branc
h
'fixes'
commit
|
commitdiff
|
tree
2005-10-21
Junio C Hamano
da
e
m
o
n
.
c: remove trailing
wh
i
t
e
space
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-21
Junio C
Hamano
F
i
nish
g
it-am docume
n
tation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-21
Junio C Hamano
F
i
x
m
i
ssing exports in git-am
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-20
J
u
n
i
o
C
Hamano
Make sure we barf on re
f
^{type} failu
r
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-20
J
u
nio C
H
amano
Be mo
r
e car
e
ful tangl
i
ng ob
j
ect chains
w
hile
m
arking
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-20
Junio C
Hamano
g
it-
f
etch/push/p
u
ll
:
documenta
t
ion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-20
Junio C H
a
ma
n
o
Do not f
e
ed re
v
-list
an invalid SH
A
1
expressio
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-19
Jun
i
o C Hamano
count-ob
j
ects: squelc
h
error fr
o
m
fin
d
on sparse object
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-19
Junio C Hamano
git-clone: always keep p
a
ck
s
ent from
remote (document
a
ti
o
n)
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-19
J
u
nio C Hamano
gi
t
-
c
lone:
a
lw
a
ys keep p
a
c
k
s
ent
f
ro
m
remo
t
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-19
Junio C
H
a
mano
Do n
o
t ask for obje
c
t
s kno
w
n to be
complete
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-19
Jun
i
o
C Hamano
Do not ask for object
s
known
t
o be comp
l
ete
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-19
J
unio C Hamano
Even when overwriting
tags,
rep
o
rt if t
h
ey
a
re changed
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
J
u
nio C Haman
o
R
em
o
v
e
unused include
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
Junio
C
Hamano
gi
t
-chec
k
out: reve
r
t
specific paths to either ind
e
x
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
Jun
i
o C Hamano
Teach git-
a
dd a
n
d g
i
t-
c
om
m
it to han
d
le
filenames starting
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
J
u
n
i
o C Haman
o
Forward
port t
h
e
"funny
r
ef
avoid
a
nce" in clone an
d
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
Jun
i
o
C Ham
a
n
o
Adju
s
t t
e
sts for not quo
t
ing SP
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
Junio C Hamano
D
o not quote SP
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
Juni
o
C Hamano
git-apply: remove
u
n
us
e
d --s
h
ow-files flag
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
Juni
o
C Hamano
update-index --index-
i
nfo: a
d
ju
s
t for funny-path quoting
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
J
unio
C Haman
o
A
d
d tests for funny
p
athn
a
mes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
J
un
i
o
C
Hamano
Update documenta
t
ion for C
-
style quoti
n
g
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
Junio C Hamano
Upd
a
te git-
s
ta
t
us to new git-diff
-
* and git-ls-files
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
J
uni
o
C
H
amano
Up
d
a
te git-diff-* to use
C
-
sty
l
e quoting for
f
unny
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
Junio C Hamano
Improve "git add" again
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
Junio C Hamano
Upd
a
te ls-file
s
and
l
s-tree to use C-s
t
yle
quo
t
ing
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
Junio C
Hama
n
o
Update gi
t
-apply to use
C
-style quot
i
ng for f
u
nny
pathnames
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
Junio C Hamano
Functio
n
s to quote and
u
nquote pathnames in C
-
style
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-18
Junio C Hamano
Merge
branc
h
'fi
x
es'
commit
|
commitdiff
|
tree
2005-10-18
Ju
n
io C Ham
a
no
git-checkout-index: documentation updates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-17
J
u
nio C Ham
a
no
ref-format documentation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-16
Junio C Haman
o
Sparse
-
directory s
a
fety fix
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-16
Junio C Hamano
Mer
g
e branch
'
fixes'
commit
|
commitdiff
|
tree
2005-10-16
Junio C
Hamano
We
do not de
p
end on p
a
tch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-16
Junio C Hama
n
o
M
erge
b
ranch 'svn' of http://
n
etz
.
smurf
.
noris
.
de/git/git
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-16
Junio C H
a
mano
Squelch compiler warnings
f
r
o
m c
o
nne
c
t
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-16
Junio C
H
amano
Di
s
able hooks
d
uring tests
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-16
Junio
C Hama
n
o
w
hatcha
n
ged: d
o
cument -m option from git-d
i
ff-tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-15
Junio C Hamano
Sho
w
pee
l
ed onion from upload-p
a
ck and se
r
ver-info
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-15
Junio
C
Hama
n
o
Introd
u
ce no
t
a
t
ion "ref^
{
type
}
"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-15
Junio C Haman
o
Ignore fun
n
y refname sent
f
r
om remo
t
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-15
Junio C Hamano
R
e
f
use to
cr
e
ate funny r
e
f
s in clone
-
pack, git-fetch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-15
Junio C
H
amano
gi
t
-check-ref-format: reject f
u
nny ref
names
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-15
Junio C Hamano
Mer
g
e branch 'fixes
'
commit
|
commitdiff
|
tree
2005-10-15
Junio C Hamano
Show curl erro
r
a
bit
better
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-14
Junio C H
a
mano
for
m
a
t
-
patch: take
sequence of ranges
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-13
J
u
nio C Hamano
tutorial: update the initial commi
t
exampl
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-13
Junio C Haman
o
git-am: do not fail
i
f 3-way
f
a
llback succeeds
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-13
Jun
i
o
C
Hamano
c
l
on
e
-
pack: n
e
w option --keep tells 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
H
amano
clone-pa
c
k: new option
-
-keep tells it not to explode
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-13
Junio
C
Hamano
Fix packname h
a
s
h
generation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-13
Junio C Hamano
g
i
t-am: inter
a
ctive should fail gracefully
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-12
Junio C Hamano
g
i
t
-
fetch --tags: d
e
al wit
h
tags with spa
c
es in
t
hem
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-12
Jun
i
o
C Hamano
Q
u
ote r
e
ference names while fe
t
ch
i
ng with curl
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-10-12
Ju
n
io C Haman
o
Merge branch 'fi
x
es'
commit
|
commitdiff
|
tree
2005-10-12
Junio C Ham
a
no
Use
core
.
fil
e
mode
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next