repo.or.cz
/
git
/
trast.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Refactor merge strategies into separate includable file.
2005-11-06
Jon Loeliger
Refacto
r
merge
s
trate
g
ies into
s
eparate includabl
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C
H
a
ma
n
o
Document expat
depe
n
de
n
cy
w
h
en using http-push
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio
C Hamano
Merge in http-push fir
s
t stage
.
commit
|
commitdiff
|
tree
2005-11-06
N
i
ck H
e
n
g
evel
d
Refre
s
h
the remote lock if it is about t
o
e
x
pire
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
N
i
ck H
e
n
ge
v
e
ld
I
m
prove lock handling
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Nick
H
en
g
eveld
Suppor
t
remote refere
n
c
e
s wi
t
h sl
a
shes
i
n
their names
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
N
ick Hengeveld
Verify remote packs, speed up pending req
u
est queue
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Nick Hengev
e
ld
Add s
u
ppor
t
f
o
r push
i
ng to a remote repository using
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
J
un
i
o C
Hamano
Deb
i
an: test build
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C
Hamano
Fur
t
h
e
r
Debian spli
t
fixes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C H
a
mano
Install asciidoc sources a
s
well
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Ha
m
ano
Packag
e
split: Debian
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
J
unio C Hamano
Si
m
plify CFLAGS/DEFINES in Makefile
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio
C Hamano
git-fet
c
h: fa
i
l
if
s
pecifi
e
d refspec d
o
es n
o
t mat
c
h
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hama
n
o
Documentation: pull/clone
r
e
f
m
apping
clarification
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio
C
Hamano
gi
t
-format-patch: si
l
ly typo fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
J
uni
o
C Hamano
test: t4102-apply
-
r
ename fai
l
s with s
t
r
ict umask
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
J
u
n
io
C
Ha
m
ano
g
i
t-c
l
o
n
e
:
fix l
o
cal c
l
one
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Ju
n
i
o C
H
amano
i
nit-db::copy_file(
)
-
u
se copy_fd()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hamano
copy
.
c
::c
o
py_fd(
)
- do not leak file
d
e
scriptor on
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C H
a
m
an
o
Documentat
i
on:
f
ormat-patch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Juni
o
C Hamano
form
a
t-patch: "rev1
.
.
" shou
l
d
me
a
n "rev
1
.
.
HEA
D
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hamano
Document
a
tio
n
: git-fetch/pu
l
l updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Jon Loeliger
Ad
d
ed
a few examples to git
-
pull man page
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hamano
Doc
u
men
t
the --no-com
m
i
t
flag bet
t
er
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
Ju
n
io
C
Hamano
Docum
e
ntat
i
on: -merge and -pull: describe merge strategie
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
Junio C Hamano
Do
c
umentation:
g
it-add -- do not say "cache", add
e
x
amples
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
Junio C Hamano
git-ta
g
:
Do n
o
t assume the worki
n
g tree root is writab
l
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
Nick
H
enge
v
e
l
d
Remove t
h
e tem
p
f
ile if it is e
m
pty
a
fter the req
u
e
s
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
I
l
lustrat
i
on: "
C
ommit DAG Revision
N
aming"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio
C
Hamano
Illus
t
ration:
"Git Dif
f
Types"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio
C
Ham
a
no
Illustrat
i
on: "Funda
m
ent
a
l Git I
n
dex
O
perat
i
o
ns"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
J
unio C Hamano
git
-
merge-ours: make s
u
re ou
r
ind
e
x matches
H
EAD
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Ju
n
io C Hamano
Add 'ours' merge strategy
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Add
-
-no-commit to git-merge/gi
t
-pu
l
l
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Doc
u
ment --since and --until op
t
io
n
s to rev-
p
arse
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Jun
i
o C Hamano
Be careful whe
n
dere
f
e
r
e
n
cing tags
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Pe
t
er Erikse
n
[PAT
C
H] Clean
u
p the SunOS Makefile rule
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Ju
n
io
C
Ham
a
no
Ignore '\r' at
the end of lin
e
in $
G
IT_DIR/config
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Alex Riesen
remov
e
CR/LF from
.
git
i
gnore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
J
uni
o
C Hamano
Do not fai
l
o
n h
i
erarchical b
r
anch names
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Jun
i
o C Hamano
Make tes
t
-date
b
u
i
ldable a
g
ain
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Junio C Ham
a
no
git
-
clone: do no
t
forget to cr
e
ate origin branc
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Junio C Hamano
Do
not put
a
ut
o
matic me
r
ge message a
f
t
e
r
signed-o
f
f
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Ju
n
io C Hamano
Add
-
P
to
t
h
e
documentati
o
n head
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
M
a
rtin L
a
n
g
hoff
cvs
i
mport: cvsps sh
o
uld be q
u
i
e
t
too
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Martin
Langhoff
cvsimp
o
rt: introduce
-
P <cv
s
ps-output-file> opti
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
M
a
r
t
in Langhof
f
cvsimpo
r
t: catch error condition where cvs host
disappears
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
J
u
nio C Hamano
Do
n
ot in
s
tall
b
ackwar
d
compatibility links anym
o
re
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-01
J
os
e
f Weidend
o
r
f
e
r
Str
i
p any
t
r
a
iling
s
lash on
d
estin
a
t
i
on argument
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-01
Petr B
a
u
dis
git-
a
m
.
txt is no stu
b
anymore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-01
Petr Baudis
Documentation for git
-
fmt-merge-msg
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-01
P
etr Baudis
Remove gi
t
-find
t
ags
.
perl
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-01
Jon Loeliger
Re
m
ove 'Previo
u
sly this co
m
mand was known as
.
.
.
'
m
essa
g
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-01
Junio C Haman
o
Fix con
s
tness of
input in
m
ozilla-s
h
a1/sha1
.
c::SHA1_Update()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-01
J
unio C Haman
o
Document the use of
"
current di
r
ec
t
ory" as pull s
o
urce
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Linus
Torvalds
Add
exam
p
l
e
s
f
o
r git-lo
g
d
ocumen
t
a
t
ion an
d
others
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Jun
i
o C
H
a
mano
Wor
k
around an RPM bui
l
d
pr
o
blem
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Junio C
H
a
m
a
no
Fix rev-l
i
st d
o
cumentati
o
n
again (--s
p
arse a
n
d pa
t
h
sp
e
c
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Junio
C Hamano
Update git-pack-objects documenta
t
io
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Junio C
H
amano
U
p
date git-rev-list
o
ptions
lis
t
in rev-p
a
r
s
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Junio C Hamano
Update usag
e
string
and d
o
cu
m
entation for g
i
t-re
v
-list
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Chris Sh
o
emak
e
r
Add
t
o u
s
age and docs
f
or git-add
.
s
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Chris Shoem
a
ke
r
Add to documentation of git-up
d
ate-i
n
d
e
x
arguments
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Chris Shoe
m
aker
Add u
s
age state
m
ent to
g
i
t
-
c
h
e
ckout
.
s
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Junio C Hamano
G
IT 0
.
99
.
9
maste
r
branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Junio C
H
a
mano
G
I
T
0
.
99
.
9
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
J
u
nio
C
H
aman
o
Documentation updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Junio
C
H
ama
n
o
Do not mmap-copy the whole thing
;
j
u
st use
c
opy_fd()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
J
unio C Haman
o
Teach local-f
e
tch about lazy object direct
o
r
ies
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Junio C
Hamano
Fix recent documentation form
a
t breaka
g
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Johan
n
es
Schindelin
make t5501
l
ess anno
y
in
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Johannes S
c
hin
d
elin
fix multi_ack
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Johannes Sc
h
inde
l
i
n
git-f
e
t
c
h-pac
k
: Support mult
i
_ac
k
ext
e
nsion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
J
ohan
n
e
s
Schindelin
g
it-uploa
d
-
p
ack: Support t
h
e
multi_ack protocol
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Johannes
S
chin
d
elin
Supp
o
rt rec
e
iving
s
erver
c
apabilities
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
J
o
ha
n
nes Schindelin
git-u
p
load-
p
ack: More efficient usage of the has_sha1
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
J
ohannes
S
chind
e
lin
Implement
an intero
p
erability te
s
t
for
fetch
-
pack/uploa
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Johannes Sc
h
inde
l
i
n
Impleme
n
t a test fo
r
git-
f
etc
h
-pack/g
i
t-upload-p
a
ck
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
J
o
hannes Sc
h
indelin
Make
m
a
ximal use of the remote refs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Johanne
s
S
chi
n
delin
S
u
bje
c
t
:
[PATCH] git-
f
e
t
c
h
-pack: Do n
o
t use git-rev
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Junio C Hamano
g
i
t
-
a
pply --
n
umstat
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
c
.
shoe
m
a
ker@cox
.
n
et
Add usage help t
o
g
i
t
-p
u
sh
.
sh
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
c
.
shoem
a
ker@cox
.
net
Add
u
sage help f
o
r git-reset
.
sh
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
c
.
shoem
a
ker@cox
.
net
M
i
n
o
r clarifi
c
ati
o
ns in diffcore documentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
c
.
s
h
o
e
mak
e
r
@
cox
.
net
Re
m
ov
e
-r from
common d
i
f
f options docume
n
tation in
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
c
.
shoemaker@cox
.
net
update usage string for
g
it
-
commit
.
sh
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
c
.
sho
e
maker@co
x
.
net
g
i
t-push
.
sh: Retain cuteness, add helpfulness
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-28
Linu
s
T
orv
a
lds
Be more careful about referenc
e
p
arsing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-28
Lin
u
s Tor
v
alds
B
e mar
g
ina
l
l
y
more car
e
ful about
rem
o
ving obj
e
cts
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-28
Chris Shoemaker
Document
a
t
i
on
c
hanges to recursive option for g
i
t-diff
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-28
Pa
v
e
l
R
oskin
fix testsuit
e
to tolerate
s
paces
in p
a
th
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-28
Junio C Ham
a
no
D
o
cument git-patch-id a bit be
t
ter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-28
Johannes Schindelin
Add more g
e
nerated f
i
les
to
.
gitignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-28
Johannes Schin
d
elin
Link
git
-
n
a
m
e
-rev a
n
d git-symbolic-ref
from the main
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-28
Linus T
o
rvalds
Create o
b
ject subdirectories on
demand (p
h
ase II)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-27
Junio
C Ham
a
no
Mer
g
e
branch 'js-fat'
commit
|
commitdiff
|
tree
2005-10-27
Junio C Hamano
Merge bran
c
h 'l
t
-dense'
commit
|
commitdiff
|
tree
2005-10-27
Junio C Ham
a
n
o
Merge http://www
.
kernel
.
org/pu
b
/s
c
m
/gitk/gitk
commit
|
commitdiff
|
tree
2005-10-26
Linus Torvalds
git-rev-list: do not f
o
rget
non
-
commit r
e
fs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next