repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation(tutorial): adjust merge example to the new merge world order.
2005-12-08
J
unio C Hamano
Documentati
o
n(t
u
t
o
rial): adjust
merge example to the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-08
Junio
C Hamano
Docu
m
entati
o
n(
c
vs-migra
t
i
on): minor cleanu
p
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-08
Ju
n
io C Hamano
Docu
m
entation(
g
lossary)
:
minor f
o
rmatting clean-ups
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-08
Junio C
H
am
a
no
Docume
n
t
ation:
g
i
t
.
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
/
scm/gitk/
g
i
t
k
commit
|
commitdiff
|
tree
2005-12-07
Jun
i
o C Hamano
u
pdate-index: allow
--index-
i
nfo
t
o
a
dd hig
h
er stages
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-07
Junio C Hamano
git-merge-one: new merge world
order
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-07
Junio C Hama
n
o
checkout-index: all
o
w ch
e
cki
n
g out from higher st
a
ges
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-07
Ja
s
on Riedy
Use printf rather
t
h
an echo -n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-07
Jun
i
o C Hamano
qsort() ptrdiff_t may
b
e larger t
h
an
int
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-07
Jason Riedy
[PA
T
C
H
] Initial AI
X
por
t
ability fi
x
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-06
Ju
n
io C Hamano
git-merge-one-f
i
le: r
e
surrect leading pa
t
h creat
i
o
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-06
Junio C Hamano
D
o
cument
a
iton (read
-
tree): update descri
p
tion of 3-way
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-06
Junio C H
a
ma
n
o
Docu
m
enta
t
i
on: has
h
-objec
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-06
Junio
C
Hamano
w
rite-tree: check ex
t
r
a
ar
g
uments and die but b
e
a
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-06
Junio
C
H
amano
in
i
t
-
db
:
check extra argum
e
nts
and
complain
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-06
J
u
nio C Haman
o
hash
-
object: -- and
-
-help
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-06
Jon Loe
l
iger
Added
docu
m
entation for
few mi
s
sing
o
pt
i
ons
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-06
J
u
n
i
o
C
Hamano
git-mv to work with Perl
5
.
6
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-06
Junio C
Hamano
Fix 5501
t
est
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio C
H
a
m
ano
Clean up co
m
patibility de
f
i
n
iti
o
ns
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Jason Ried
y
[PA
T
CH] D
o
cume
n
t config
.
mak in INSTAL
L
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Juni
o
C
Hamano
c
onfig
.
c: remove unneces
s
a
ry header in mini
m
u
m
c
onfiguration
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
J
u
nio C Hamano
server
-
i
n
fo
.
c:
and
tw
o
functions are not used
anymore
.
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: use p
a
ck_loc
a
l
l
ike ev
e
rybody el
s
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Ha
m
ano
Docum
e
n
t
at
i
o
n
: s
h
are
d
re
p
osito
r
y mana
g
ement
i
n tuto
r
ial
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
Docu
m
entatio
n
:
p
u
sh/rec
e
i
v
e ho
o
k ref
e
re
n
ces
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
Docu
m
entati
o
n
:
g
i
t-
d
iff asciido
c
table workaround
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Juni
o
C Hamano
Document
a
tio
n
: gi
t
-mv
m
anpage
workar
o
und
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio
C
Ha
m
ano
D
o
cum
e
nta
t
ion: talk about pathspec in bisec
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Ham
a
no
se
r
ver-in
f
o: throw away T computation as
w
ell
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
J
uni
o
C
Ham
a
no
server-i
n
fo: stop sortin
g
pack
s
by latest d
a
te
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Ju
n
io C
Ha
m
ano
server-i
n
fo
.
c: drop unused D lines
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Juni
o
C H
a
m
ano
sha1_file
.
c: mak
e
su
r
e packs
in an al
t
ernate odb is
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hama
n
o
git
.
c:
remove exc
e
ss output f
o
r d
e
bugging when
comman
d
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
J
uni
o
C
Hamano
struct tree: remove
u
nused f
i
eld "par
e
nt"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Juni
o
C
H
a
m
an
o
Do
c
umentat
i
on: rebas
e
does not use ch
e
rry-pick
a
ny
m
ore
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Petr Baudi
s
Document the --(n
o
-
)
edi
t
switch of git-revert an
d
git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
show
-
branch: all
o
w gl
o
b
p
attern to
n
ame branches to
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Petr
B
audis
Update the
git-ls
-
tre
e
do
c
um
e
ntat
i
on
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-04
Junio C Ham
a
no
git
.
c
:
two fixe
s
, gitsete
n
v type and off-by
-
o
ne
e
rr
o
r
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-04
Ju
n
io C Hamano
c
o
m
pat/setenv: do not free wh
a
t
w
e fed putenv
(
3)
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-04
Daniel Barkal
o
w
Warn w
h
en se
n
d-
p
ack does nothing
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-04
J
unio C Haman
o
[
P
ATCH] d
a
e
m
on
.
c an
d
path
.
enter_repo()
:
r
e
vamp path
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-04
H
.
P
eter Anv
i
n
A few more options for git-cat-f
i
le
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-04
Jason Riedy
Add comp
a
t/setenv
.
c
, use in
git
.
c
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivine
n
N
ew
t
est case: Criss-cro
s
s
merge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-03
F
redrik Kuivinen
New t
e
st c
a
se: m
e
rge with directory/file conf
l
icts
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kui
v
inen
test-lib
.
sh
:
Add new fun
c
tion, test_expec
t
_co
d
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik K
u
ivinen
g
i
t-merge: Exit w
i
th c
o
de 2 if n
o
s
trategy wa
s
able
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
No
nam
e
d
o
c
umentation: git-tag
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
J
unio C Hamano
documen
t
ation: git-bisect
(help HTML break man)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
No
name
docume
n
tation:
c
larify
r
ead-tree --reset
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
git-merge
document
a
t
i
on: conf
l
i
cting me
r
ge leav
e
s hi
g
h
er
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
merge-one-file: make
su
r
e
w
e do not
misme
r
ge symbolic
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
J
u
nio C H
a
mano
merge-o
n
e-file: make sure we
c
r
e
at
e
the m
e
rged file
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
J
u
nio C Hamano
t
3
100: add ls-
t
ree -t and -d tests
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
J
u
nio C Ha
m
a
no
merge
-
r
ecursive
:
a
d
just git-ls-tree
u
se for
t
he latest
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Alex Riesen
g
it w
r
ap
p
e
r: more careful
a
rg
u
m
e
nt
s
tuffi
n
g
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio
C
Haman
o
g
it-merge-one-
f
ile: do not worry about 'rmdir
-p' n
o
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Junio C
Hamano
ls-tree: -
-
na
m
e-only
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Hama
n
o
ls-tree: r
e
surrect '
-
d' to mea
n
's
h
ow tr
e
es only'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
L
i
nus T
o
rvalds
git-ls-tr
e
e: add "-t"
o
pt
i
on to always sh
o
w the tr
e
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Junio C
Hamano
Makefile: say
t
he defaul
t
target
u
p
front
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Jun
i
o C
Hamano
Docu
m
enta
t
ion: describ
e
'-f
'
option to git
-
fetch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Timo Hirvo
n
en
Mo
v
e couple
o
f i
f
de
f
s after "in
c
lude con
f
ig
.
m
k"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
M
e
rge branch
'jc/subdir'
commit
|
commitdiff
|
tree
2005-11-30
Juni
o
C Hamano
Merge bra
n
ches 'jc/a
p
p
ly',
'lt/ls-tree', 'lt/bisect
.
.
.
commit
|
commitdiff
|
tree
2005-11-30
Tommi Vi
r
tanen
D
o
not
attempt to access literal d
i
rname "GIT_OBJECT_DIRECT
O
R
Y
"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Juni
o
C Hamano
Tutorial: adjust
m
erge e
x
ampl
e
to rec
u
rsive
st
r
ategy
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
m
erge-recursive:
m
a
t
c
h the unmerged index entry behaviour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
J
unio C Hamano
diff-file
s
: sho
w
diffs with
s
tage0 and unmerged s
t
age
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Linus
T
or
v
alds
merg
e
-on
e
-file: leave unmerged inde
x
entri
e
s upon automerge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Linus
Torvalds
diff-files:
-1/-2/-3
t
o diff against unmerged stage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Haman
o
git-diff: d
o
not turn off -p/-M with
a
ny diff
options
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C Ha
m
ano
Mer
g
e http://www
.
kernel
.
org/pub/scm/
g
i
t
k/
g
itk
commit
|
commitdiff
|
tree
2005-11-29
A
l
ex
Ries
e
n
[PATC
H
] Add tests f
o
r git-mv in subdire
c
torie
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Johannes Schindeli
n
[PATCH
]
Make git-mv work in subdirectories, to
o
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ha
m
ano
format-
p
at
c
h: run dif
f
in C locale
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Hamano
forma
t
-
p
atch: do
n
ot abuse 3-dash
marker line
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
n
io C H
a
m
a
no
format-patc
h
:
rem
o
ve
a
pp
l
ies-to
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
applypatch
:
use "inde
x
" lines not "applies-to"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C Hamano
apply
m
box: ty
p
ofix to enable -m option
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Matthias
Url
i
chs
SVN
i
m
por
t
: U
s
e one log
c
al
l
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
j
d
l@freescale
.
com
Fix typos an
d
mi
n
or fo
r
mat issu
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ni
c
k
Hengeveld
http-
p
ush cleanup
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Pavel
R
osk
i
n
git-clone --shared
sho
u
l
d imply --
l
o
cal
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
hash-object
.
c:
t
ype-fix to squelch compiler
w
arnings
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
a
man
o
define
d
ie() for
script
s
that use it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
verify-tag: ma
k
e it operab
l
e
from a
subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C Ham
a
no
tag
:
make it operable from a subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
n
io C Hamano
lost-found: ma
k
e
it o
p
erab
l
e from a
s
ubdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Hamano
branch: make it ope
r
able from a subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Hamano
ls-remote: de
f
ine
d
ie() now we do not
u
s
e
git-sh-s
e
tu
p
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C
Hama
n
o
count-obj
e
c
t
s: make it
operable f
r
om a subdir
e
ctor
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o
C
Hamano
Make the rest of comm
a
n
ds work from a subdirect
o
ry
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
Make netwo
r
k
i
ng comman
d
s to
w
ork
f
rom a su
b
dire
c
tory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
ls-tree: work fr
o
m
sub
d
ire
c
t
or
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
hash-object
:
work with
i
n subdi
r
ectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C Hamano
checkout-index: work from subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next