repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation: talk about guts of merge in tutorial.
2005-11-07
Junio C Ham
a
no
D
o
cumen
t
ation: talk a
b
out guts of merg
e
i
n
t
utorial
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Junio C H
a
mano
Set up
remotes/o
r
igin t
o
tra
c
k all remote br
a
nches
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Junio C Hamano
gi
t
-
sta
t
us
:
do not
mark un
m
e
rge
d
paths as commit
t
able
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Juni
o
C Hamano
l
s
-files: --others should not say unmerged
pat
h
s are
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
Documen
t
expat dependenc
y
when using http-push
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
M
erg
e
in htt
p
-push first stage
.
commit
|
commitdiff
|
tree
2005-11-06
J
u
nio C Ham
a
no
Debian: test buil
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio
C
Hamano
Further Deb
i
an split fixes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Haman
o
Install asc
i
idoc sourc
e
s as
w
ell
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Jun
i
o C Ham
a
no
Package split: Debian
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hama
n
o
S
i
mplify
CFLA
G
S/D
E
FI
N
ES in Ma
k
efile
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hama
n
o
g
i
t-
f
e
t
ch
:
fail i
f
specified refspec does not
m
atch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hama
n
o
Documentation
:
pull/
c
l
o
ne ref map
p
ing
c
lar
i
f
icati
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Jun
i
o
C
H
aman
o
git-fo
r
mat-pa
t
ch:
s
ill
y
typo fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C H
a
mano
test
:
t4102-app
l
y-
r
ename
fails with str
i
ct umask
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hama
n
o
git-clone:
fix
l
ocal
clone
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Jun
i
o C Hamano
init-db::copy_file() - u
s
e cop
y
_fd()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Jun
i
o C Hamano
copy
.
c::copy_fd() - do
not le
a
k fil
e
des
c
ri
p
tor o
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Ham
a
no
Docu
m
entation:
format-pa
t
ch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Ha
m
ano
format-patch: "rev1
.
.
"
s
hou
l
d mean "rev
1
.
.
HEAD"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
J
u
n
io C Hamano
Documentation:
g
it
-
fetch/pull updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hamano
Document the
--no-co
m
mi
t
flag better
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
Junio C
Hamano
Documentation: -merge and
-pull:
d
e
scrib
e
merge strategies
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
Jun
i
o
C
Hamano
D
oc
u
m
entation: git-add -- do not s
a
y "cache
"
,
a
dd examples
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
Junio
C
Hamano
g
i
t
-
t
ag: Do not
a
ssum
e
the working
t
ree
r
oot
i
s
writa
b
le
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio
C Hamano
I
llustra
t
io
n
: "Comm
i
t
D
AG Revision Nam
i
ng"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Haman
o
Illustration: "Gi
t
Dif
f
Types"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Juni
o
C Haman
o
Ill
u
stration:
"
Fundamen
t
a
l G
i
t Index
Oper
a
t
ions"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hama
n
o
git-merge-ours
:
make sure our i
n
dex matches
HEAD
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Jun
i
o C Hamano
Add 'ours'
merge strategy
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Ju
n
io C Hamano
Add --no-commit to git-merge/git-pull
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Juni
o
C Ham
a
no
Document --since and
--
u
n
til options
to rev-parse
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C
Hamano
B
e
c
a
ref
u
l when d
e
referencing t
a
g
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
I
g
n
or
e
'\r'
at
t
he end of line in
$GIT_
D
IR/config
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Haman
o
Do n
o
t fail on hierarchic
a
l branch nam
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Ju
n
io C
H
amano
M
a
ke test
-
d
ate bu
i
ldable aga
i
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Junio C Hamano
git-
c
l
one:
d
o
not forget t
o
create origin bra
n
ch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Ju
n
io C Hamano
Do not
put au
t
omatic merge messa
g
e after signe
d
-off
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Juni
o
C
Hama
n
o
Add -P to t
h
e
document
a
t
ion
h
ead
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Junio
C
Ham
a
no
Do not install backward co
m
patibility links anymore
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-01
Juni
o
C Hamano
Fix const
n
es
s
o
f
i
n
p
u
t in mozi
l
la-sha1/sha1
.
c::SHA1_
U
pda
t
e()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-01
Jun
i
o C Haman
o
Document the use
o
f "
c
u
rrent director
y
" as
p
u
l
l source
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Junio
C Hamano
Work around
an RP
M
build
p
r
oblem
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Junio C Hamano
Fi
x
rev-list documen
t
ation
a
gain (--spa
r
se and pa
t
hspec)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Junio C Ham
a
no
U
p
d
ate
g
i
t-pack
-
objects docum
e
nt
a
t
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Ju
n
io C Haman
o
Update git-rev
-
list op
t
i
o
n
s
list in rev-p
a
rs
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Ju
n
io
C Hama
n
o
Update
usage string
a
nd doc
u
mentatio
n
for gi
t
-rev-list
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Junio C Hamano
GIT 0
.
99
.
9
master branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Junio C Hamano
GI
T
0
.
99
.
9
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Junio
C Hamano
Document
a
tion
u
pdates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Juni
o
C
H
amano
Do not mmap-
c
opy th
e
whole thing; just
u
se copy_fd()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Junio
C
H
amano
Teach
l
o
c
al-fetch about lazy
obj
e
c
t
dir
e
ctor
i
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Junio C Ham
a
n
o
F
i
x recent do
c
umentation for
m
at breakage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Ju
n
io
C H
a
mano
gi
t
-apply --numstat
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-28
Junio C Hama
n
o
Document git-pa
t
ch-id a b
i
t better
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-27
Junio
C Hamano
Merge branc
h
'js-fat'
commit
|
commitdiff
|
tree
2005-10-27
J
unio C H
a
man
o
M
e
rge branch 'lt
-
de
n
s
e'
commit
|
commitdiff
|
tree
2005-10-27
J
u
ni
o
C Ha
m
ano
Merge http://www
.
kernel
.
org
/
pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2005-10-26
J
u
nio C Hamano
pac
k
-objects: A
l
low
use of pre-g
e
nerat
e
d pa
c
k
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-26
Junio C Hamano
upload-pack: tighten request v
a
lidation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-26
Junio C H
a
mano
Add [v]iew patch
in git-am
i
n
teractive
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-26
Juni
o
C Ha
m
ano
git-am: make
it ea
s
ier a
f
ter fixing up an
u
n
ap
p
licable
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-25
Juni
o
C Hamano
Revert
recent fetch-pack
/
uplo
a
d-
p
ack upd
a
tes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-24
Ju
n
io C H
a
mano
upload
-
pack:
f
ix
think
o
in common-commit finde
r
code
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-24
Jun
i
o C
H
amano
Cl
a
r
i
fy git
s
t
atu
s
o
utput
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-23
Jun
i
o C Hamano
Merg
e
branch 'fixes'
commit
|
commitdiff
|
tree
2005-10-23
Junio C
Hamano
gi
t
-show-br
a
nch: Fix off-by-o
n
e
e
rror
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-22
Junio C Hamano
Allow git-merge no
t
to co
m
mi
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-22
Junio C H
a
mano
upload-pack: Increase MAX_
H
AS
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-22
J
u
nio C Hamano
Fix malformatted git-am d
o
cumen
t
ation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-21
Junio C H
a
mano
Merge branch 'fixes'
commit
|
commitdiff
|
tree
2005-10-21
Junio
C
Hamano
da
e
mon
.
c: remove trailing
whitespace
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-21
Juni
o
C
Ha
m
ano
Finish git-am docu
m
ent
a
tion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-21
Junio C Hama
n
o
Fix
missing
e
x
ports in git-am
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-21
J
unio C Hamano
M
e
rge /pub/scm/git/git to recover lost side bran
c
h
Signed-off-by:
Junio C Hamano
<junio@hera.kernel.org>
commit
|
commitdiff
|
tree
2005-10-20
Ju
n
i
o
C
Ha
m
ano
Make sure we b
a
rf o
n
re
f
^{type}
failure
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-20
J
unio C H
a
man
o
Be more care
f
ul
t
angli
n
g object chains while marking
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-20
Junio
C
Hamano
git-f
e
t
c
h/
p
ush/pull: docu
m
en
t
ation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-20
Junio C
H
am
a
n
o
Do not feed r
e
v
-
list an inv
a
lid SHA1 expr
e
ss
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-19
Ju
n
io C Hamano
coun
t
-obje
c
t
s:
sque
l
ch error from find o
n
s
p
ars
e
o
bject
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-19
J
u
n
io C Hamano
git-clo
n
e
: always ke
e
p pack sent
f
rom rem
o
te (d
o
cu
m
enta
t
i
o
n)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-19
Jun
i
o
C
Hamano
g
i
t-clone: always keep pack sent from remo
t
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-19
Junio C Hamano
Do not ask for
objects known t
o
be com
p
l
e
te
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-19
Junio C Hamano
Do not ask for objects kno
w
n t
o
be comple
t
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-19
J
u
nio
C
Hamano
Even wh
e
n
o
verwriting tags, report if t
h
ey are chang
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-18
J
unio
C Hamano
Re
m
ove un
u
sed inc
l
ude
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-18
Junio C Hamano
git-che
c
kout:
r
evert speci
f
ic
p
aths to either index
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-18
Junio C Hamano
T
each
g
it-add and gi
t
-
commit to handl
e
fil
e
n
a
mes s
t
art
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-18
Junio C Hamano
For
w
ard port the "funny ref avoidance" in clone
a
nd
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-18
Junio C H
a
m
ano
Adjust tests for not q
u
oting S
P
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-18
Junio C Hamano
Do not
q
uote SP
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-18
Ju
n
io C Hama
n
o
git-apply: rem
o
ve unused
-
-show
-
files flag
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-18
Junio C Hama
n
o
update-index -
-
index-i
n
fo
:
a
d
just for funny-pa
t
h
q
uoting
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-18
Juni
o
C Hamano
Add tests f
o
r fu
n
ny pathnam
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-18
Junio C Haman
o
Upd
a
te do
c
umentat
i
on for C
-
s
tyl
e
q
uoting
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-18
Junio C H
a
mano
Update git-status to new
gi
t
-
di
f
f-
*
and git-ls-files
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-18
J
u
n
i
o C Ham
a
no
Updat
e
git-diff-*
t
o us
e
C-style qu
o
ting for funny
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-18
J
unio C Hama
n
o
Impro
v
e "g
i
t add" a
g
ain
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-18
Junio C Hamano
Up
d
at
e
ls-files
an
d
ls-tree to use C-style q
u
o
t
ing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-18
Junio C H
a
mano
Update git-apply to use C-s
t
yle quot
i
ng for
f
unny pathnames
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next