repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'hold/am'
2005-12-14
Junio C Hamano
Me
r
ge branch 'ho
l
d
/
am'
commit
|
commitdiff
|
tree
2005-12-14
Junio C Hamano
reb
a
se: d
o
n
o
t get
c
onfu
s
ed in fast-forwa
r
d
s
ituation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-14
Jun
i
o
C
Hamano
Merge b
r
anch 'fk/usage'
commit
|
commitdiff
|
tree
2005-12-14
Ju
n
i
o
C Hamano
Doc
u
ment
a
tion
:
t
o
p
ic branches
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-14
J
u
n
i
o
C
Hamano
applypatch: n
o
n
eed to do non-portable
[[
.
.
.
]]
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-14
Junio C Hamano
t3200: bran
c
h -
-
help
d
oes
n
ot die
anymor
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-14
Junio C Ha
m
an
o
Everyday: a bit more exam
p
le
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-14
Junio C
H
a
ma
n
o
che
c
kout-i
n
dex: fix checki
n
g out
spe
c
ifi
c
pat
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-14
Ju
n
io C Hama
n
o
[PA
T
CH] allow merging any
c
ommittish
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-13
Junio C Ha
m
an
o
gi
t
-
c
lone: tell the use
r
a
bit
m
ore about
c
lone-
p
ack
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-13
Junio C
H
amano
Document
a
tion: not
l
e
arnin
g
core
g
it commands
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-13
Junio C Hamano
D
o
cu
m
entat
i
on
:
d
iff examples
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-13
Ju
n
io C Hamano
Documentati
o
n: fix missing links to git(7)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-13
Junio C
H
amano
D
ocumentation:
more examples
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-13
J
u
nio C Hamano
Everyd
a
y: a bit
m
ore example
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-13
Ju
n
io C
H
ama
n
o
diffcore-
b
r
e
a
k: do not break too small filepa
i
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-13
Junio C Hamano
Revert "Add
d
eltifi
e
r test
.
"
commit
|
commitdiff
|
tree
2005-12-13
Juni
o
C Ham
a
no
R
e
vert "diff
-
delta
.
c: allow
delta wi
t
h emp
t
y blob
.
"
commit
|
commitdiff
|
tree
2005-12-13
Junio C
Hamano
E
ve
r
y
d
ay: so
m
e
examp
l
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-12
Junio C Hamano
diff-delta
.
c:
allow delta
with emp
t
y
blob
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-12
J
unio C
H
amano
Add deltifier test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-12
Junio C Haman
o
d
i
ffcore-b
r
eak
.
c: check diff_de
l
t
a() return value
.
Signed-off-by:
Junio C Hamano
<junio@twinsun.com>
commit
|
commitdiff
|
tree
2005-12-11
Junio C Hamano
t/t6022: a new test
for renami
n
g
m
erge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-11
Junio C Haman
o
merge
-
recursive: cl
e
anu
p
setIndexStages
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-11
J
u
nio C
H
amano
m
erge
-
recursive:
l
e
ave unmer
g
ed entries i
n
th
e
index
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-11
Juni
o
C Hama
n
o
for
m
at-patch: use
s
ame number of digits
i
n numb
e
rs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-11
Ju
n
io C Hamano
t00
0
0:
catc
h
trivial pilot
erro
r
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-11
J
unio C Haman
o
t3300
:
funny n
a
me test
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-10
Junio C Ham
a
no
Link Everyday GIT to main document
a
tion tr
e
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-10
Junio C
Hamano
Eve
r
yda
y
GIT with
20 com
m
ands
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-10
Jun
i
o C
H
amano
Use GIT_
E
X
EC_PATH explicitly
for initial git-init
-
db
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-09
Junio
C
Haman
o
g
i
t
-
prune: never lose obje
c
ts rea
c
hable fro
m
our refs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-09
Junio
C
Hamano
qsort()
:
ptrdiff_t may be
larger than int
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-09
Junio
C Hamano
Docume
n
tation: git-
p
rune
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Ju
n
io C Hamano
sh
o
w
-
b
r
a
nch: c
o
mm
e
nt typo
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Junio
C
Hamano
Documentation: recursi
v
e
i
s
t
h
e defa
u
l
t
strat
e
gy these
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Jun
i
o
C
Hamano
Make sure we use compat/subp
r
ocess
.
p
y
wi
t
h Python
2
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Juni
o
C
Hamano
refs
.
c: make sure
leading di
r
ectories
exist before
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Junio C Hamano
Documentation(tutorial): adjust m
e
rge examp
l
e
t
o t
h
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Junio C Ha
m
ano
Documentati
o
n(cvs-migr
a
tion): minor cleanups
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Junio C Hamano
D
o
cument
a
tion(glossary
)
: min
o
r formatting
c
l
ean-ups
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Junio C Ham
a
no
D
o
cumentation: git
.
html/git
.
7
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-07
Junio C Hamano
Merge http://www
.
kernel
.
org/pub
/
s
cm
/
gitk/gitk
commit
|
commitdiff
|
tree
2005-12-07
Juni
o
C Hamano
update-index
:
allow -
-
index-
i
n
fo
t
o
a
dd higher s
t
ages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-07
Junio C Ham
a
no
git-merge-one: new merge world
o
rder
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-07
Junio
C Hamano
checkout-index:
a
llow checking out from higher stages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-07
Ju
n
io C Hamano
q
s
or
t
() pt
r
diff_t may be larger
than i
n
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Junio C Ham
a
no
git-merge-one-file: resurrect
l
ead
i
ng path creat
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Junio C Ham
a
no
Documentaiton (read-tree
)
: up
d
a
te description of 3-way
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Ju
n
io C Hamano
Docu
m
e
ntation: hash-object
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Juni
o
C Ham
a
no
w
rite-tree:
check extr
a
arg
u
ments and di
e
but
be a
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
J
u
nio C Ham
a
no
init-db: check extra
arguments
a
nd complain
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Ju
n
io C Hamano
has
h
-
object: --
a
nd --help
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Junio
C
Hamano
git-mv to
w
ork with Perl
5
.
6
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Junio C Hamano
F
ix 5501 t
e
st
Signed-off-by:
Junio C Hamano
<junkio@twinsun.com>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Jun
i
o
C
Ham
a
no
Clean up compa
t
ib
i
lity definitions
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
J
unio C Ham
a
no
config
.
c:
remove unnecessary
he
a
der in
m
inimum configu
r
ation
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio
C H
a
mano
se
r
ver-info
.
c: and
t
wo functions are not used anymore
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C
Hama
n
o
server-info
.
c:
u
s
e
p
ack_local l
i
ke
everybody else
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio
C Hamano
Documen
t
ation: shar
e
d re
p
o
sitor
y
manag
e
ment in t
u
t
o
rial
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
Documentation: push/receive hook r
e
feren
c
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
Docume
n
tation: gi
t
-d
i
ff asc
i
i
d
oc table wo
r
karound
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
J
u
n
i
o C Ha
m
a
n
o
Docum
e
ntation: git-
m
v manp
a
ge workar
o
und
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Ju
n
io C Hamano
Doc
u
mentation: t
a
lk a
b
o
u
t pathspec i
n
b
i
sect
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
J
uni
o
C Ham
a
no
server-info: throw away
T computati
o
n as well
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Juni
o
C Ham
a
n
o
serv
e
r-in
f
o
: stop sorting packs by latest date
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
serve
r
-inf
o
.
c
:
d
r
op unused D lines
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C
Hamano
sha
1
_
file
.
c: make sure packs in an alter
n
ate odb i
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
g
it
.
c
: rem
o
ve excess output for de
b
ugging when comma
n
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
struct tree: remove unused field "parent"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Haman
o
Document
a
tio
n
: rebase does not
use che
r
r
y-pick anymore
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Juni
o
C Hamano
show-
b
ra
n
c
h: allow glob pat
t
ern t
o
n
am
e
branches to
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-04
Juni
o
C
Hamano
g
it
.
c: t
w
o fixes, gitsetenv
t
ype and off-by-one erro
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-04
J
uni
o
C Hamano
compat/setenv:
d
o not free what w
e
fed
p
utenv(3)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-04
Ju
n
io C Hamano
[PATCH]
d
aemon
.
c an
d
path
.
e
n
ter
_
re
p
o():
r
evamp pat
h
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
J
un
i
o
C
Ham
a
no
documentation:
g
i
t
-
bi
s
ect
(he
l
p
H
T
ML brea
k
ma
n
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio
C
Hamano
git
-
merge documentation: con
f
lic
t
ing merge leave
s
higher
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C
H
a
mano
merge-one-fi
l
e: make
s
ure we do
n
ot mismerge
s
y
m
bolic
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
J
unio C Hamano
merge-one-file: ma
k
e
s
ure we creat
e
the merged fi
l
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
t3100: add ls-tree -t and -d
t
ests
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Jun
i
o
C
Haman
o
me
r
ge-recur
s
iv
e
: adjust
g
it-ls-tree use for the late
s
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Haman
o
git-merge-
o
ne-fil
e
: do
n
ot worry
a
bout 'r
m
dir -p' not
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
J
unio
C
Hamano
l
s
-tree
:
-
-name-on
l
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Juni
o
C Hama
n
o
l
s-tr
e
e: resurrect '-d' to mean 'show trees
only'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Ju
n
io C Hamano
Make
f
il
e
:
s
a
y
t
he default target upfront
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Junio C
Ha
m
ano
Documentation: describe
'
-f' opt
i
on to git-fetch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
J
u
nio C Hamano
Merge b
r
a
n
ch
'jc
/
subdir'
commit
|
commitdiff
|
tree
2005-11-30
J
uni
o
C Ham
a
no
Merge branches 'jc/apply', 'lt
/
ls-tree', 'lt/bisect
.
.
.
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
Tutorial: adjust merge example to recursive strategy
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C
H
amano
merge-recursive: match the u
n
merged index entry behaviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
diff-f
i
l
e
s: show diffs with stage0 and
unm
e
rged stage
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
J
unio C
Hamano
git-di
f
f: do not turn off -p/
-
M with any dif
f
o
ptions
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C
Hamano
Merge http://www
.
kernel
.
org/pub/scm
/
gitk
/
gi
t
k
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
amano
fo
r
m
a
t
-
patch: run
diff in
C
locale
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
f
o
rmat-patch: do not abuse 3-dash marke
r
line
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Hamano
form
a
t-patch: remove applies
-
to
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C Hamano
applypatch: use
"index" lines not "app
l
ies-t
o
"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C
Haman
o
apply
m
box:
typof
i
x
to
enable
-
m option
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
hash-object
.
c: typ
e
-fix to squelch
c
ompil
e
r warnings
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C
Hamano
define die(
)
f
o
r scr
i
pts that use it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next