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
Docu
m
entation: -merge and -pul
l
: descri
b
e
me
r
ge str
a
t
e
g
i
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
J
unio C
Hamano
Documentati
o
n
:
git-
a
dd --
d
o not sa
y
"cache", add ex
a
mples
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
Jun
i
o C Hamano
git-
t
ag: Do no
t
ass
u
me the working tr
e
e root is writable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
Nick Hengeveld
R
e
move
the temp fi
l
e if it i
s
empty af
t
er t
h
e request
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio
C Hamano
Illustration:
"Commit
DAG Revisi
o
n
N
a
m
ing"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hama
n
o
Illustra
t
ion: "Git Diff Types"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Ju
n
io C
H
amano
Illu
s
tration: "
F
undam
e
nt
a
l Git Index Operation
s
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio
C
Hamano
git-merge-ours: make sure our index matches
HEAD
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hama
n
o
Add
'
our
s
' merge strategy
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Jun
i
o C
H
amano
Ad
d
-
-
no-co
m
m
i
t
to git-merg
e
/git-pull
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hama
n
o
Document -
-
since a
n
d --until
options
to re
v
-parse
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
B
e
careful wh
e
n d
e
referencing
t
ags
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Peter Eriks
e
n
[
P
ATCH
]
Cl
e
an up the SunOS
Makefile rule
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Jun
i
o C Hamano
Ign
o
re '\r' at the end of line in
$
G
I
T_DIR/co
n
fi
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Alex Riesen
r
emov
e
CR/LF f
r
om
.
gitignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Ju
n
io
C
Haman
o
Do not fail on hi
e
rarch
i
c
al
b
ranch nam
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C
Hamano
Make test-date buildable
a
gai
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Junio C Haman
o
git-clone: do not
f
orget
t
o create origin branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
J
u
nio C H
a
mano
Do no
t
put
automatic m
e
r
g
e
m
essage after s
i
g
ned-off
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Junio
C
Hamano
Add -P
t
o t
h
e documentation he
a
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Mar
t
in Lan
g
h
off
cvsimp
o
rt: c
v
sps sho
u
ld
b
e
quiet
t
o
o
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
M
a
rtin Langhoff
cvsimport: introduce -
P
<
cvsps-output-fi
l
e> option
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Martin Langhoff
cvs
i
mpor
t
:
catch er
r
or condition where cvs
host disappears
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
J
unio C
Hamano
Do no
t
i
nstall backward compat
i
b
i
l
i
t
y
links anymore
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-01
J
osef We
i
d
e
ndorfer
Strip any trailing slash on destination argument
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-01
Petr Baudis
git-am
.
txt is
n
o stub
a
nymore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-01
Petr
Baudis
Docum
e
ntation fo
r
g
i
t-
f
mt-me
r
g
e
-ms
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-01
Petr
B
a
udis
Remov
e
g
i
t-findt
a
gs
.
perl
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-01
J
on Loel
i
ger
Remove
'
Previously
this command was
known as
.
.
.
' m
e
s
s
ages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-01
Junio
C
H
am
a
no
Fix constness of
i
n
p
u
t in mozil
l
a-sha1/sha1
.
c::SH
A
1_Update()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-01
Junio C
H
amano
Document the use o
f
"current directory" as pull so
u
rce
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Linus Tor
v
ald
s
Add e
x
amples for
git-lo
g
docume
n
tatio
n
and other
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Junio C Hamano
Work around a
n
RPM bui
l
d problem
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Junio C H
a
mano
Fix
r
ev-list documentation agai
n
(--sparse and pat
h
s
p
ec)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Junio C Ham
a
no
Update git-pack-objects documentation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Junio C Hamano
Update git-re
v
-lis
t
op
t
i
o
n
s lis
t
i
n
rev-parse
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Junio C Hamano
Up
d
at
e
u
sa
g
e string and
do
c
umentation for git-rev-list
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Chris Shoemaker
Add to usage
and docs for git-add
.
sh
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Chris Shoemaker
Add to docume
n
ta
t
ion of
g
it
-
update-
i
nde
x
a
rgume
n
t
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Chris Sh
o
e
m
aker
Add
usage stateme
n
t to
g
it-chec
k
o
u
t
.
s
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Junio C H
a
mano
GIT 0
.
9
9
.
9 mast
e
r branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Ju
n
io
C Hamano
GIT 0
.
99
.
9
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Junio
C
Hamano
Document
a
tion updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Junio
C
Hamano
Do not m
m
ap-copy the who
l
e thing;
just use co
p
y_fd()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Jun
i
o C
Hamano
Teach local
-
fetc
h
about lazy object direct
o
ries
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Junio C
H
a
m
ano
Fix recen
t
d
ocumentation format breaka
g
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
J
o
h
annes Sch
i
ndelin
make t5501 less annoying
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Johan
n
es Schind
e
lin
f
i
x m
u
lti_ack
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Joh
a
nnes Sch
i
n
d
elin
g
i
t-fetch-pa
c
k: Support multi_ack e
x
te
n
s
i
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Johannes Schi
n
delin
g
i
t-upload-pack: Suppo
r
t the multi_ack protocol
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Johann
e
s Schindelin
Support
receivi
n
g s
e
rv
e
r capabilities
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Johann
e
s Schinde
l
in
git-upload
-
p
ack: Mo
r
e efficient usage
of t
h
e has_
s
h
a
1
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Johannes
S
chindelin
Im
p
lement a
n
interoperability test for fetch-
p
ack/upload
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Johanne
s
S
c
h
i
ndelin
Impl
e
ment
a
t
e
st for git
-
fetch-pa
c
k
/
gi
t
-u
p
lo
a
d
-
pack
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Johanne
s
Schinde
l
i
n
Make maximal use
o
f
t
he
r
emote refs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
J
o
hannes Schind
e
lin
Subjec
t
: [PATCH] git-fe
t
ch-
p
ack: Do not use
git-
r
ev
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Jun
i
o C
H
ama
n
o
git-apply
--numst
a
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
c
.
sho
e
maker@cox
.
net
A
dd us
a
ge help to
g
i
t-push
.
s
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
c
.
shoemak
e
r@cox
.
net
A
d
d usage help for git-reset
.
sh
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
c
.
shoema
k
er@
c
ox
.
net
M
i
no
r
clarifications in
d
if
f
core docum
e
ntation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
c
.
s
hoemaker@cox
.
net
Re
m
ove -r from commo
n
di
f
f op
t
ions documentatio
n
in
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
c
.
shoema
k
er@cox
.
net
update usage string for git-commit
.
sh
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
c
.
s
h
oemaker@cox
.
net
git-pus
h
.
s
h
: Retain cuteness
,
add helpfulness
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-28
Linus Tor
v
alds
B
e
more ca
r
e
f
ul about reference parsin
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-28
Linus Torvalds
Be marginally more car
e
f
ul about
r
emoving objects
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-28
Chris Shoemaker
Documentation changes to recursive
o
p
tion for
g
it-di
f
f
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-28
Pave
l
R
oskin
fix tests
u
ite
to tol
e
r
ate spaces
in path
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-28
Junio C Hamano
Document git-pa
t
c
h-id a bit
b
etter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-28
Johannes Schi
n
deli
n
Add m
o
re
gen
e
ra
t
ed
f
i
les to
.
gitignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-28
Johann
e
s Schindelin
Lin
k
git-
n
ame-
r
e
v and git
-
symboli
c
-ref fro
m
the main
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-28
Linus Torvalds
Create
o
b
ject su
b
directories on demand (phase II)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-27
Jun
i
o C Haman
o
Merge branch 'js-fat'
commit
|
commitdiff
|
tree
2005-10-27
J
u
ni
o
C
Hamano
Mer
g
e bra
n
ch 'lt-dense'
commit
|
commitdiff
|
tree
2005-10-27
J
unio
C Hamano
Merge http://www
.
k
ernel
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2005-10-26
Linus Torv
a
l
d
s
git-r
e
v
-
lis
t
: do not forg
e
t non-comm
i
t refs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-26
Linus Torvald
s
git-re
v
-lis
t
: make -
-
dense th
e
defau
l
t
(and in
t
rod
u
ce
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-26
J
o
h
a
nnes Schi
n
delin
Test in git-init-db if
t
he fi
l
emode
c
an be tr
u
sted
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-26
J
o
hannes Schindelin
Add git-
n
ame-re
v
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-26
Junio C Hamano
pack-objects: Allo
w
use
o
f pre-gen
e
rated p
a
ck
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-26
Linus To
r
valds
F
i
x what
to do and how
to det
e
ct when ha
r
dlink
i
ng
fails
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-26
Johannes Schindeli
n
Fix cloning
(
memory co
r
r
uption)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-26
Junio
C
H
amano
u
p
l
oad-
p
ack: tighten request validation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-26
Johannes Sch
i
ndelin
W
ork aro
u
nd missing har
d
lin
k
s
o
n FAT for
m
a
tted med
i
a
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-26
Johanne
s
Schindelin
create_s
y
mref: if
symlink fails
,
fall back to wr
i
t
i
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-26
Junio C H
a
man
o
Add [v]iew patch i
n
g
it-am interactive
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-26
Junio
C Hamano
git-am: make it easier after
f
ixi
n
g up an unapplicable
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-26
Linus Torvalds
gi
t
-
r
e
v-list:
f
ix "--den
s
e
" flag
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-26
Pet
r
Baudi
s
Add some
missing com
m
an
d
s to
t
he g
i
t
.
txt c
o
mm
a
nds l
i
s
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-26
Petr Baudis
Add
usage s
t
r
i
ng to git-updat
e
-index
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-26
Petr Baudis
Documentatio
n
for
git-shell
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-26
J
osef Weidendor
f
er
Check an
o
the
r
error condi
t
ion in
git-mv
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-26
Randal L
.
Schwartz
fix d
a
emon
.
c
to comp
i
le on
OpenBSD
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-25
Junio C Haman
o
Rever
t
recent fetch-pack/upload-pack updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-24
Jun
i
o C H
a
mano
up
l
oad-pack: fix thinko in common-commi
t
f
i
nd
e
r c
o
d
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-24
J
o
h
annes Schindelin
git-fetch-p
a
c
k: Imple
m
en
t
client p
a
r
t of
t
h
e
mul
t
i_ack
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-24
Johannes Sch
i
ndelin
git-fetch-pa
c
k:
Do not use git-rev-l
i
st
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-24
J
o
hannes Schindelin
git-upload-pack
:
Support sending multiple ACK m
e
s
s
ages
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-24
Johan
n
es Schindelin
git-uplo
a
d-
p
ack: More effi
c
ient usage of the has_
s
ha1
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-24
Linus T
o
rvalds
Add git-shell
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-24
J
u
nio C Hamano
Clarify git
status output
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next