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
Junio C
Hamano
A
d
d 'ours' merge strategy
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
J
u
nio C Hamano
Add --n
o
-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 Hamano
Document --since
a
nd --until options to
r
ev-parse
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Be ca
r
e
ful when dereferencing tags
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio
C Hamano
Ignor
e
'\r' at the end of li
n
e i
n
$GIT_DIR/config
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
J
u
nio
C
Ham
a
no
Do not
f
a
i
l on hierarchical
br
a
nch names
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Juni
o
C Ha
m
a
no
Make test
-
date b
u
ildable again
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Junio C
H
aman
o
git-clone: do n
o
t
f
org
e
t to creat
e
origin branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Ju
n
io C Haman
o
D
o
not put automa
t
i
c merge me
s
sage after
s
ign
e
d-
o
f
f
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Junio
C
Hama
n
o
Add -P to
t
he doc
u
ment
a
tion h
e
ad
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Junio C Ham
a
no
D
o not install backward compati
b
ili
t
y
lin
k
s an
y
more
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-01
Juni
o
C
Hamano
Fix
constness of input in mozil
l
a-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
H
a
mano
Do
c
umen
t
the
u
se of "
c
urrent directory
"
as
p
ull source
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
J
unio C H
a
m
a
no
Work around an
RPM build problem
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Juni
o
C
Ham
a
no
Fix rev-lis
t
docum
e
n
t
ati
o
n ag
a
in
(
--sparse and pathspec)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Junio
C
Haman
o
Upd
a
te git-pack-ob
j
ects
docu
m
entation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
J
unio C Hamano
Update git-rev-
l
ist opt
i
ons
li
s
t
i
n rev-parse
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
J
un
i
o C
Hamano
Upd
a
te usage string and document
a
tion fo
r
git-rev-list
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
J
unio C Hama
n
o
GIT 0
.
99
.
9
maste
r
branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Jun
i
o
C Ham
a
n
o
GIT
0
.
99
.
9
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Junio C Hamano
Doc
u
mentation updat
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
J
u
ni
o
C
H
amano
Do not mma
p
-copy the whol
e
thing; just
use copy
_
fd()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Ju
n
i
o
C Hamano
T
each local-fetch about lazy object directories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Jun
i
o C H
a
mano
F
i
x recent document
a
tion format breakage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Junio
C
Hama
n
o
git-apply --n
u
mstat
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-28
Junio C Hamano
Document git-pat
c
h-id a bit better
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-27
Junio C Hamano
M
e
rge branch
'js-fat'
commit
|
commitdiff
|
tree
2005-10-27
J
u
nio
C Hama
n
o
M
e
rge branch 'lt-dense'
commit
|
commitdiff
|
tree
2005-10-27
J
u
nio C Ha
m
ano
Merge http://www
.
kernel
.
org/pub/sc
m
/gitk/gitk
commit
|
commitdiff
|
tree
2005-10-26
Juni
o
C
H
a
m
a
n
o
p
ack-o
b
je
c
ts:
A
llo
w
use of pre-ge
n
e
r
ated pack
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-26
Ju
n
io C Hamano
upload-pac
k
:
t
ighten req
u
est va
l
idati
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 g
i
t-a
m
interactive
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-26
Jun
i
o C Hamano
git-am:
make it easier after f
i
xing
u
p an unapplicable
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-25
Junio C Hamano
Revert r
e
cent fetch-pack/uplo
a
d-pac
k
updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-24
Ju
n
io C Ham
a
n
o
upload-p
a
ck:
f
ix think
o
i
n
common-commi
t
finder code
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-24
Junio
C Hamano
Cl
a
r
i
fy gi
t
s
t
atus output
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-23
Junio C
H
a
m
ano
Merge branc
h
'fix
e
s'
commit
|
commitdiff
|
tree
2005-10-23
Junio C Hamano
git-show-bra
n
ch
:
Fix off-by-one
e
rror
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-22
Junio
C
Hamano
Allow
git-m
e
rge
n
ot
to commi
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-22
Junio C Ha
m
a
no
upload-pack: Increase MAX_HAS
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-22
Jun
i
o
C Hamano
Fix malforma
t
ted
git-am documen
t
ati
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-21
J
un
i
o C Hamano
Merge branch 'fixe
s
'
commit
|
commitdiff
|
tree
2005-10-21
Junio C Ha
m
an
o
daemon
.
c:
r
e
move
t
ra
i
ling
w
hitesp
a
ce
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-21
Junio
C
Hamano
Finish git
-
a
m
document
a
tion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-21
Junio C Hamano
Fix
m
is
s
ing
export
s
in git-am
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-21
J
u
n
i
o C Hamano
Merge /p
u
b
/scm/git/
g
it to r
e
c
o
v
e
r lost side branch
Signed-off-by:
Junio C Hamano
<junio@hera.kernel.org>
commit
|
commitdiff
|
tree
2005-10-20
Junio C Hamano
M
ak
e
sure
w
e barf on ref^
{
type} fai
l
ur
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-20
Jun
i
o C Ha
m
ano
Be more
careful tangling
object cha
i
ns
w
hile marking
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-20
Ju
n
io
C
Hama
n
o
git
-
fetch/push
/
p
u
ll: documentation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-20
J
u
nio C Hamano
Do not
feed rev-list an i
n
va
l
id SHA1 expression
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-19
Juni
o
C
H
a
mano
c
o
u
n
t
-o
b
je
c
ts
:
sque
l
ch error f
r
om find on
sparse objec
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-19
Junio C Ha
m
ano
git-c
l
one:
a
lways keep pack
s
ent fro
m
r
emote (documentation)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-19
Junio C
Hamano
git-clone:
always keep
pack sent from remote
.
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 be complete
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-19
Ju
n
io C Hamano
Do
not ask for objects
known to be co
m
p
l
e
t
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-19
Junio C
Hamano
Even w
h
en
o
verwriting tags, report if the
y
a
r
e changed
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-18
Junio C
Hamano
Remov
e
unused
include
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-18
J
u
nio
C
Hamano
git-ch
e
c
k
out:
revert
specific paths to either index
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-18
Junio C Hamano
Teach g
i
t
-
add
and git-commit to handle filenam
e
s start
i
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-18
Junio C H
a
man
o
F
o
rward port the "f
u
nny ref avoi
d
an
c
e
"
in clo
n
e and
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-18
Junio C Ham
a
n
o
Adjust tests
for not quotin
g
S
P
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-18
Junio C Hamano
Do not quote SP
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-18
Junio
C
Ham
a
no
g
i
t-app
l
y: remove unused --show
-
f
i
les flag
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-18
Junio C Hamano
update-index
--index-info: adjus
t
for funny-pa
t
h q
u
oti
n
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-18
Jun
i
o C
H
amano
Add
tes
t
s
for funny
path
n
ames
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-18
Junio C Hamano
Update docu
m
entation for
C
-
style q
u
oting
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-18
Junio C Ha
m
ano
Upda
t
e
g
it
-
status to n
e
w
git-diff-*
a
n
d
git-ls-
f
il
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-18
Jun
i
o
C
Hama
n
o
Update git-diff-
*
to use C
-
s
tyle quoting for funny
.
.
.
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
Update ls-files and
ls-tree to use C-style quoting
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-18
Junio C
Hamano
Update g
i
t-ap
p
ly to use
C-style quoting for funny pathnames
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-18
J
unio C Ha
m
ano
Functions
to
q
uote an
d
unquote pathnames in C-sty
l
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-18
J
u
nio
C
Hamano
Merge branch 'fixes'
commit
|
commitdiff
|
tree
2005-10-18
Juni
o
C
Ha
m
ano
git-check
o
ut
-
index: documentation u
p
dates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-17
Junio
C
Hamano
ref-format doc
u
m
e
ntation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-16
Junio C Hamano
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 Haman
o
Merge
b
r
a
nch 'fixes
'
commit
|
commitdiff
|
tree
2005-10-16
Junio
C
H
aman
o
We do not depend on p
a
tch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-16
Junio C Hamano
Merg
e
branch 'svn' of http://netz
.
sm
u
r
f
.
noris
.
de/g
i
t/gi
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-16
Junio
C
Hamano
Squelch compiler warn
i
ngs f
r
om conn
e
c
t
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-16
Ju
n
io
C
Hamano
Disable hooks duri
n
g
tests
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-16
Junio C
H
am
a
no
whatchan
g
e
d: docu
m
ent -m option f
r
om git-diff-tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-15
Junio C Hamano
Show peeled
onion from upload-pack and server-inf
o
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-15
Junio
C Haman
o
Introdu
c
e notation "ref^{ty
p
e}"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-15
Junio C Hamano
Ignore funn
y
re
f
n
ame
sent
f
rom remote
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-15
Junio
C
H
am
a
n
o
Refu
s
e to create
f
unny refs in cl
o
ne-
p
a
c
k
, git-fetch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-15
Junio C Hamano
git-check-
r
ef-f
o
rmat:
r
eject funny
r
ef
names
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-15
Juni
o
C
H
amano
Merge
b
ranch 'fixes'
commit
|
commitdiff
|
tree
2005-10-15
Junio
C
Hama
n
o
Show c
u
rl error a
b
it better
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-14
Junio C Hamano
for
m
at-
p
atc
h
:
t
a
k
e
se
q
uence of ran
g
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-13
Junio C Hama
n
o
t
u
torial: update
the
i
n
itial commit example
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-13
Jun
i
o C
H
a
m
a
n
o
git-am
:
do not fa
i
l if 3-way
fallback succee
d
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-13
Juni
o
C Hamano
clone-pack: ne
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 Ha
m
ano
clone-pac
k
: new op
t
io
n
--ke
e
p
t
ells it not
t
o explode
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-13
Junio C Hamano
Fix packname hash
generation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-13
Junio
C
Hamano
git
-
am:
i
nter
a
ctive shoul
d
fail
g
r
aceful
l
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-12
Junio C Hamano
git-fetch --ta
g
s
:
deal with tags with spaces in them
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-12
Ju
n
io C
Hamano
Q
u
o
te re
f
e
rence names whi
l
e fetc
h
ing with
curl
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-12
Junio C Hamano
Merge branch
'
f
ixe
s
'
commit
|
commitdiff
|
tree
2005-10-12
Junio C Ha
m
an
o
Use
c
ore
.
filemode
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next