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
git-merge-one: new merge world order.
2005-12-07
Jun
i
o C Hamano
git-merge-one: new
m
er
g
e
world order
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-07
Junio C
Hamano
checkout-index:
allo
w
che
c
king out from higher st
a
ges
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-07
J
aso
n
Ri
e
dy
U
se printf rather than echo -n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-07
J
u
nio C Ha
m
ano
qs
o
r
t
() pt
r
diff_
t
may be l
a
rger t
h
an
i
nt
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-07
Jason
R
iedy
[
P
A
T
CH
]
I
nitial AIX portability fi
x
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-06
Ju
n
io
C
H
amano
g
i
t-m
e
rge-one-file:
r
esurr
e
ct leading path creation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-06
J
u
nio C Hamano
Docum
e
nt
a
iton (read-tree): up
d
a
te description o
f
3-way
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-06
Junio C H
a
mano
Docum
e
ntation: hash
-
object
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-06
Jun
i
o C Hamano
write-tree:
ch
e
ck e
x
tra a
r
g
u
m
e
nts
and die but be a
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-06
Junio C
H
am
a
no
in
i
t-db: ch
e
ck extra a
r
g
u
m
ent
s
and complain
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-06
Junio C
Haman
o
h
a
sh-object: --
a
n
d
-
-help
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-06
Jon Loeliger
Added do
c
ument
a
ti
o
n for few missing opti
o
n
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-06
Juni
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
Ham
a
n
o
F
i
x
5501
t
es
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
C
lean up compatibility definitions
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Jason
Riedy
[P
A
TC
H
]
Document conf
i
g
.
mak
i
n
I
NSTALL
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
c
o
nfig
.
c
: remove unnec
e
s
sary header in minimum c
o
nfiguratio
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
s
e
rver-
i
nfo
.
c: and two
f
unction
s
are not used a
n
ymore
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio
C
Hamano
server-info
.
c: use pack_local like everybody
e
lse
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio
C
Ham
a
no
Docum
e
ntation: s
h
ared r
e
pos
i
tory management in tut
o
rial
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
J
u
n
i
o C H
a
ma
n
o
Documentation:
push/re
c
eive
h
o
o
k
references
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio C
Hamano
Docume
n
tation: git
-
d
i
ff asciidoc table
workaround
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
Documenta
t
ion: git-mv
manpage workar
o
und
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
Documentat
i
on:
ta
l
k about pathspec in bisect
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Jun
i
o
C Ham
a
no
se
r
ver-info: throw away
T computation as well
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio C
H
amano
s
e
rver-info: stop sort
i
ng p
a
cks b
y
la
t
e
s
t date
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
J
u
nio C Ham
a
no
ser
v
e
r-info
.
c: drop unus
e
d D l
i
ne
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
J
u
nio C Hamano
sha1_f
i
le
.
c: make
s
ure packs i
n
an al
t
erna
t
e odb is
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Ju
n
io C H
a
mano
g
i
t
.
c: remove excess output for debu
g
ging when co
m
mand
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
J
u
nio
C
Hamano
struct
tree: remove un
u
sed
f
i
eld "parent"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
Documenta
t
ion: rebase doe
s
not use cherry
-
pick anymore
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
P
etr
Baudis
Docu
m
ent
th
e
--(no-)
e
dit switch
of
git-revert and
g
it
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Ju
n
io C Hamano
show-b
r
anch: allow g
l
ob pattern to name branches to
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Petr B
a
u
dis
Update
the git-ls-t
r
ee documentation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-04
Junio C Hamano
git
.
c: two fix
e
s,
g
itsetenv type an
d
off-by
-
one error
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-04
Jun
i
o C Hamano
compat/setenv: do not
f
ree w
h
at we
fed putenv(3)
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-04
Dani
e
l B
a
rkalow
Wa
r
n w
h
e
n
send-pack does nothing
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-04
J
uni
o
C Hamano
[PATCH] da
e
mon
.
c
and path
.
enter_repo(): r
e
vamp path
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-04
H
.
Peter A
n
vi
n
A
few
m
ore o
p
tions for g
i
t-cat-fi
l
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-04
Jaso
n
Riedy
Add compat/setenv
.
c,
u
se in git
.
c
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-03
F
r
edrik K
u
ivi
n
en
New test
c
a
s
e: Criss-cross merge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik
K
uivinen
New
test case:
merge wit
h
directory/
f
ile confli
c
t
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-03
F
redrik K
u
i
v
inen
t
est
-
l
ib
.
sh
:
A
d
d
new fun
c
tion, test_expect_code
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-03
F
redr
i
k
Kuivin
e
n
git-mer
g
e: Exit with co
d
e 2 if no
s
tr
a
t
egy was abl
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
No name
docu
m
entation: git-tag
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Ham
a
no
do
c
umentation: git-bisect (help HTML br
e
ak
man)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
No name
doc
u
men
t
ation
:
clarify read-tre
e
--reset
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio
C Hamano
git-m
e
rge documentation: conflicting merge leaves higher
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
merg
e
-on
e
-file:
m
ake s
u
re we do not misme
r
ge symbolic
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Ha
m
ano
m
e
r
ge-one-fi
l
e: make su
r
e
we
c
reate
the me
r
ged file
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Jun
i
o C Hamano
t3100: add ls-tre
e
-t and -d te
s
ts
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
merge-re
c
u
r
sive:
a
d
j
ust
git-
l
s
-
tree u
s
e for the lat
e
st
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Alex Riese
n
git wr
a
pper: more care
f
ul argument stuff
i
ng
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
J
unio C
Hamano
g
it-merg
e
-one-file:
do not
w
o
rry
a
bout 'rmd
i
r
-p'
not
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Ju
n
io C Hamano
l
s
-tree
:
--name
-
o
n
l
y
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Hamano
l
s-tree
:
resur
r
ect
'
-d' to mean 'sho
w
tr
e
es onl
y
'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Linus Torv
a
lds
gi
t
-ls-tree: add "-t" option to always show t
h
e t
r
e
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Hamano
M
a
ke
f
ile: say the default tar
g
et up
f
ront
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Hamano
D
o
cumentation: describe '-f
'
op
t
ion to git-fetch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Timo Hirvonen
Move couple of ifdefs a
f
ter "include config
.
mk"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Jun
i
o C Hamano
Merge branch 'jc/sub
d
i
r'
commit
|
commitdiff
|
tree
2005-11-30
Junio C
H
a
m
ano
Merg
e
bra
n
ches 'jc/apply',
'lt
/
ls-t
r
e
e
', 'lt/bisec
t
.
.
.
commit
|
commitdiff
|
tree
2005-11-30
Tommi Virtanen
Do not attempt to access literal dirname "
G
IT_OBJECT_DIRECTOR
Y
"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Ju
n
io C H
a
man
o
T
utori
a
l
:
adj
u
st
m
e
r
g
e example
t
o recursi
v
e strategy
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Jun
i
o C Haman
o
merge-recursive: m
a
tch
the unmerged in
d
e
x
entry
behaviour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio
C Hamano
diff-
f
iles: show
diffs wi
t
h
sta
g
e0 and unmerged stage
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Linus Torvalds
merge-one-f
i
le:
l
eave u
n
merged index entries
upon
a
u
tomerge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Lin
u
s Torvalds
diff-files: -1/-2/-3 to diff against un
m
erg
e
d stage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
J
u
nio C
H
amano
git-diff: do
n
ot turn o
f
f
-p
/
-M with
a
ny diff option
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
Merge http://
w
ww
.
kernel
.
org/pu
b
/scm
/
gitk/gitk
commit
|
commitdiff
|
tree
2005-11-29
A
le
x
Riesen
[PATCH] Add test
s
for git-mv in subdirect
o
ries
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
o
h
annes Schi
n
deli
n
[PATCH] Make git
-
mv work in s
u
bdirector
i
es, too
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o
C Hamano
format-patch: run
d
iff in C locale
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ham
a
no
f
o
rmat-pa
t
ch: do not
abu
s
e 3-dash marker lin
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Hamano
format-p
a
tch: r
e
move appli
e
s
-
to
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
ni
o
C Hamano
a
p
plypatch:
u
se "index" l
i
n
e
s
not "applie
s
-to"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
ap
p
lymbox: typofi
x
t
o enable -m
o
ption
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Matthias Urlichs
S
VN import:
U
se one log call
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
jdl@freescale
.
com
Fi
x
typos a
n
d minor format issues
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ni
c
k H
e
nge
v
el
d
http-push cleanup
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
P
avel Roskin
git-clone --sh
a
red sh
o
uld imply --local
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
i
o
C
Hamano
has
h
-object
.
c: typ
e
-fix to squel
c
h
compiler warning
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C
H
amano
def
i
ne die() for scripts that
use it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ha
m
ano
ver
i
f
y-t
a
g: make
it operable from a
subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C Hamano
tag:
m
ake it operable
f
rom a subdi
r
ectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C H
a
man
o
los
t
-
f
o
u
nd:
m
ake i
t
operable from a
s
ub
d
irectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C
Hamano
branch: m
a
ke it ope
r
a
ble from a subd
i
re
c
t
o
ry
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Haman
o
l
s
-remot
e
: define die() now we
do
n
ot use git-sh-setup
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
n
i
o C Hamano
c
o
un
t
-obj
e
cts: make it operab
l
e
f
rom a s
u
b
d
irect
o
ry
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Ha
m
ano
Mak
e
the rest
of
c
ommands work from a su
b
direc
t
ory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C Hamano
Mak
e
net
w
orking
command
s
t
o
work from a subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
ls
-
tree:
w
ork f
r
om su
b
directory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
amano
hash-object: wor
k
within
subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C
Ha
m
ano
checko
u
t-index: work fro
m
subdire
c
tory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Hamano
f
s
ck-
o
bject
s
: w
o
rk
f
rom subdirec
t
ory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
peek-rem
o
t
e
: honor proxy
c
onfig even from s
u
b
d
i
r
ectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
ni
o
C Ham
a
n
o
git-apply: wor
k
fro
m
subdirec
t
ory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C Ha
m
ano
work
i
ng fro
m
subdirectory: pre
p
aratio
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Ham
a
n
o
bisect: quote pat
h
names for eval safety
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Li
n
us Torva
l
ds
bisect: limit t
h
e searchs
p
ace by p
a
ths
p
ecs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next