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
Junio C Ha
m
ano
gi
t
-merge
-
one: new
mer
g
e world order
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-07
Junio C Hamano
checko
u
t-inde
x
:
allow checking o
u
t
f
rom higher
sta
g
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-07
Jason Riedy
Use print
f
rather
than echo -n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-07
J
u
nio C Hamano
qsort() pt
r
diff_t ma
y
be larger than in
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-07
Jason Ri
e
d
y
[PATCH] Init
i
al AIX portability fixe
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-06
Jun
i
o
C
Hamano
git-merge-one-file:
r
esurrect leading
p
a
t
h creation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-06
Jun
i
o
C
H
ama
n
o
Documentaiton (rea
d
-tree): update descriptio
n
of 3-way
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-06
Jun
i
o C Hamano
Do
c
um
e
ntation: h
a
sh-obje
c
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-06
Junio
C Ham
a
no
write-tree
:
chec
k
ex
t
ra argu
m
ents and
d
ie b
u
t be a
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-06
J
unio
C Hamano
init-d
b
: check extra arg
u
me
n
t
s and compl
a
in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-06
J
u
nio C Haman
o
h
as
h
-ob
j
ect: --
a
nd
-
-h
e
lp
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-06
Jo
n
L
oeliger
Add
e
d docume
n
tat
i
on for few miss
i
ng opti
o
ns
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-06
Junio C
H
amano
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
F
i
x 5501 t
e
st
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio C
H
a
m
a
no
Clean up compatibility
de
f
initions
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Jason Riedy
[PATCH
]
Document
config
.
mak in INSTALL
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
J
unio C Hamano
config
.
c: remove un
n
e
ce
s
s
ary header in minimum c
o
n
f
igurati
o
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
ser
v
er-info
.
c: and two functions are
n
ot used an
y
more
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
J
unio
C
Ha
m
a
no
serv
e
r-info
.
c:
u
se pack_loca
l
l
i
ke everybody e
l
se
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hama
n
o
D
o
cumen
t
ation: shar
e
d reposi
t
ory
m
anage
m
e
n
t
i
n
tutor
i
al
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Ha
m
ano
D
ocumentation:
p
u
sh/receive hook
r
e
ferences
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio
C
Hamano
Doc
u
me
n
tation: git-diff asci
i
doc ta
b
le work
a
rou
n
d
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Haman
o
D
o
cumentation: git-mv manpage workaround
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Ha
m
ano
Do
c
umentation: talk
a
bout pathspec in bisect
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio C
Hamano
server-info: throw
a
way
T
c
omputation as well
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
J
unio
C
Hamano
serve
r
-info: stop sortin
g
packs by latest date
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
J
u
nio C
Ha
m
an
o
server-info
.
c: d
r
op u
n
used D lines
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Jun
i
o C Hamano
sha1_file
.
c
: make sure packs in an alternate odb is
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
J
u
nio C Ham
a
no
g
i
t
.
c: remove excess output for debuggi
n
g
whe
n
comman
d
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
struct tr
e
e: remove unused field "pare
n
t
"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Juni
o
C
Hamano
D
o
cume
n
tation: rebase does not
u
se
cherry-pick anymore
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Petr Baudis
Document th
e
--(no-)edit s
w
itch o
f
git
-
re
v
ert and git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
show-branch: a
l
low glob patter
n
to
n
ame bra
n
ches
t
o
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Petr Baudis
U
p
d
ate
the git-ls-tree
docu
m
e
nt
a
tio
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-04
Jun
i
o
C
H
aman
o
g
it
.
c:
two
fixes, git
s
eten
v
type and off-
b
y-one error
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-04
Ju
n
io
C H
a
m
ano
compat/setenv: do not
free w
h
at 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
hen
send
-
pack does
n
o
thing
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-04
Jun
i
o
C
Hamano
[PATCH] daemon
.
c and path
.
enter_repo(): revamp path
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-04
H
.
Peter Anvin
A
f
e
w mor
e
options for git-cat-file
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-04
J
as
o
n Ried
y
Ad
d
co
m
pat/setenv
.
c, use in git
.
c
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
New test c
a
se:
Criss-cross m
e
rge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-03
F
r
edrik
Kuivinen
New test c
a
se:
m
erge wit
h
d
irectory/file c
o
nf
l
icts
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-03
F
r
edrik Kuivi
n
en
test
-
lib
.
sh: Add new funct
i
o
n, test_ex
p
ect_code
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-03
Fr
e
drik Kuivi
n
en
gi
t
-merge: Exi
t
wi
t
h co
d
e 2 if no strategy
w
as able
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
No name
doc
u
men
t
ation: git-tag
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
J
u
nio C Hamano
d
ocumentation:
g
it-bisect (help
H
TML break man)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
N
o name
d
ocumentation:
c
la
r
i
fy read-tree --r
e
s
et
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
git-merge
d
oc
u
menta
t
ion: conflicting
m
erge l
e
aves
highe
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
J
unio C Ha
m
ano
merge
-
one-file: ma
k
e s
u
re we
d
o not mismerg
e
symbolic
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
merge
-
one-file: make sure we creat
e
the
m
erged fi
l
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C
H
a
m
ano
t
3
100: add l
s
-tree -t a
n
d -d
tes
t
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Ha
m
ano
m
er
g
e-recursive: adjust
git-ls-tree us
e
for
t
he latest
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
A
lex Riesen
git wrappe
r
: mo
r
e careful arg
u
ment
s
tuffing
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
g
i
t
-
mer
g
e-o
n
e-file: do no
t
worr
y
a
b
out 'rmdir
-p' not
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Ju
n
io
C
H
a
mano
ls-tree
:
--name-
o
nly
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Hamano
ls-tree: resurrect '-
d
' to mean 'show trees only'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Linus Tor
v
alds
git-ls-tree: add "
-
t" op
t
i
o
n
to always show the tree
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Hamano
M
a
kefile
:
say
t
he default ta
r
get upfront
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Hama
n
o
Do
c
ume
n
tation: des
c
r
i
be '-f
'
op
t
i
on t
o
g
i
t
-fetch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Timo Hirvon
e
n
Move couple
o
f ifdefs a
f
te
r
"include
c
onfig
.
mk"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio
C
Hamano
Merge bra
n
c
h
'jc/subdir'
commit
|
commitdiff
|
tree
2005-11-30
Juni
o
C Hamano
Merge branches 'jc/apply', 'lt/ls-tree',
'
l
t/
b
isect
.
.
.
commit
|
commitdiff
|
tree
2005-11-30
Tommi Virtanen
Do not att
e
mpt to a
c
c
e
ss literal dirnam
e
"GIT_O
B
JECT_DIRECTOR
Y
"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Ha
m
an
o
Tutorial: a
d
just
m
erge ex
a
mple to
recursive
stra
t
egy
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
merge-
r
ecursi
v
e: match the u
n
merged
index en
t
ry behaviour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hama
n
o
diff
-
f
i
les: show
dif
f
s with stage0 and unmerged stag
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
L
inus
Torvalds
merge-on
e
-
file:
l
eave
u
n
mer
g
ed index entri
e
s upon autome
r
ge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Li
n
us Tor
v
alds
diff-files: -1
/
-2/-3
t
o
d
iff a
g
a
i
n
st
unmerged
s
t
a
g
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
J
u
nio C Hamano
git-diff: do not tu
r
n off -p/-M with an
y
diff optio
n
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
Merge http
:
//www
.
kernel
.
org/pub/scm
/
gitk/gitk
commit
|
commitdiff
|
tree
2005-11-29
Al
e
x Riesen
[PATCH]
A
dd
t
ests for git-mv in s
u
bdirec
t
ories
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Johann
e
s
Schindel
i
n
[PATCH]
Make
git-mv
w
o
r
k in
subdirectories, t
o
o
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io
C
Hamano
for
m
at-
p
atch: r
u
n diff in C loca
l
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
n
io C Hamano
f
ormat-patch: d
o
not
a
b
use 3
-
d
a
s
h
ma
r
ker
l
i
n
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
format
-
patch: remov
e
applies-
t
o
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Hamano
applypatch: u
s
e "index" lin
e
s not "applies-
t
o
"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
a
pplymbox: typofix to en
a
b
le -m o
p
tion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Matt
h
ias Urlichs
SVN import
:
Use one log call
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
jdl@freescale
.
com
Fix
t
ypos and minor
format issues
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Nick Hengeveld
http
-
push c
l
eanup
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Pa
v
el R
o
skin
git-clone --shared
should imply -
-
local
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
hash-
o
bjec
t
.
c: type-fix t
o
squel
c
h compiler
warnings
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
i
o
C Hamano
de
f
ine
d
ie() for script
s
that u
s
e it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C Hamano
v
e
rify-
t
ag:
m
ake i
t
operable from a s
u
bdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o
C Hamano
tag:
make
it opera
b
le
f
rom a
subdirec
t
o
r
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
lost-fo
u
nd:
m
a
ke it opera
b
le
f
r
o
m
a
su
b
d
irectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
b
ranch: make
i
t operable from a s
u
bdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
ls-remo
t
e: define die() n
o
w we do n
o
t
u
se git-sh-setup
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
count-o
b
jects: ma
k
e it
o
perable from a subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ham
a
no
Make the res
t
of comma
n
ds work from a subd
i
rectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C Hamano
M
ake
n
e
t
work
i
n
g
commands to work from a subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C Hamano
l
s-tr
e
e
:
work from subdirec
t
ory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
ha
s
h-o
b
ject: work within subd
i
rectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hama
n
o
che
c
kout-
i
nde
x
: work f
r
om subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C H
a
m
a
no
fsck-object
s
: work fr
o
m
s
ubdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
peek-remote
:
honor proxy c
o
nfig even fr
o
m
subdir
e
c
tory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
git-apply:
w
o
rk from subdi
r
e
c
t
o
r
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Hamano
w
o
rking f
r
om sub
d
ir
e
ctory: preparat
i
on
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ha
m
a
n
o
bisect: quo
t
e p
a
thname
s
f
o
r
eval
safety
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Linus Torvalds
bi
s
ect: limit
the searc
h
s
p
ace
b
y
p
at
h
specs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next