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
J
unio
C
Ha
m
ano
g
it-mer
g
e-one
:
new merge world order
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-07
Junio
C Hamano
c
heckout
-
i
ndex:
allow c
h
ecking out
f
r
o
m
hi
g
her stages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-07
J
u
nio C
Ham
a
no
qsort() ptrdiff_t may be
larg
e
r th
a
n int
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
J
u
nio
C
Hamano
git-merge-one
-
fil
e
: resurr
e
ct leading path
c
reation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Junio C Hamano
Docu
m
entaiton (read-tr
e
e): update d
e
scr
i
pt
i
on o
f
3
-way
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Junio
C
Hamano
Documentation: ha
s
h-o
b
ject
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
J
u
nio C Ha
m
a
n
o
write-tree: check extra arguments and die bu
t
b
e a
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
J
u
nio
C Hamano
init-db: check extra a
r
gument
s
and complain
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Ju
n
io C Ha
m
ano
hash
-
obje
c
t
:
-- an
d
--he
l
p
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
J
unio C Ha
m
ano
gi
t
-mv to wor
k
with
Perl 5
.
6
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Junio
C H
a
m
a
n
o
Fix 5501 te
s
t
Signed-off-by:
Junio C Hamano
<junkio@twinsun.com>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C H
a
mano
Clean up compatibilit
y
definit
i
ons
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
config
.
c
: rem
o
ve un
n
e
c
essary
h
eader in minimum conf
i
guratio
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C
Hamano
server-info
.
c: and two
f
unctions are n
o
t used anymore
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
J
u
n
io C
Hamano
server-info
.
c:
u
se pack_local l
i
ke
e
v
e
rybody e
l
se
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Juni
o
C Hamano
D
oc
u
me
n
tation
:
shared reposi
t
ory management in tutorial
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
Documentation:
push
/
r
e
c
eive hook
r
eference
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C
Hamano
Documentatio
n
: g
i
t-diff asciidoc tab
l
e
workaro
u
nd
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Ju
n
io C Ham
a
no
Documentation: git
-
mv
m
a
n
page
w
orkaro
u
nd
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio
C
Hamano
Doc
u
mentation: talk
about p
a
th
s
pec in
b
i
s
ect
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
serv
e
r-info: throw away
T
com
p
u
t
ation as well
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C
Hamano
s
erver
-
in
f
o
:
s
t
op sorting packs by l
a
test date
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
server-info
.
c: dro
p
un
u
sed D lines
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Ham
a
no
sha1_f
i
le
.
c:
m
ake sur
e
packs in an al
t
ernate odb is
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
J
unio
C Hamano
git
.
c:
remove excess o
u
tput f
o
r debugg
i
ng when command
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio
C H
a
m
ano
struct
tree:
r
emove unus
e
d field "parent"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Juni
o
C
Hamano
Document
a
tion: rebas
e
does not use
cherr
y
-pick anymore
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Ha
m
ano
show-br
a
n
c
h
:
a
l
l
o
w
glob pattern to name branches to
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-04
Junio C Hamano
git
.
c: tw
o
fixes, gits
e
tenv type
a
n
d off-by-one error
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-04
J
u
nio C Ham
a
no
comp
a
t/setenv
:
do not
f
r
ee
what w
e
fe
d
pu
t
e
n
v(
3
)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-04
Junio C
H
amano
[P
A
T
C
H] daemo
n
.
c
a
nd path
.
enter_repo(): rev
a
m
p path
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Ha
m
a
no
docum
e
n
t
ation: git-bisect (
h
elp HTML
break man)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hama
n
o
git
-
m
erge documentatio
n
: conflicting
merge leav
e
s
higher
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
merge-one-fil
e
: make sure we do
not mismer
g
e symbolic
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hama
n
o
merge-one
-
file: make
sure we create the merged file
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C
H
amano
t310
0
: add ls-tree -
t
an
d
-d tests
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
merge
-
recurs
i
ve: adjust git-l
s
-
t
r
e
e
use
f
o
r the latest
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C
H
a
mano
g
i
t-merge-on
e
-f
i
le: do no
t
worry
about 'rmdir -p' n
o
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Hama
n
o
ls-
t
ree: --name-only
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Junio
C Haman
o
ls-tree: resurrect '-d' to mea
n
'show trees only'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
J
u
nio C Hama
n
o
Makefile: say the d
e
f
a
ul
t
target upfront
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Ham
a
no
Documen
t
ation: descr
i
be '-f' option t
o
git-fetc
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C
H
a
ma
n
o
M
e
rge branch
'
j
c/subdir'
commit
|
commitdiff
|
tree
2005-11-30
Jun
i
o C Hamano
Merge branches 'jc/app
l
y', '
l
t/
l
s-tree', 'lt
/
b
isec
t
.
.
.
commit
|
commitdiff
|
tree
2005-11-30
J
unio C Ham
a
no
T
u
toria
l
: adju
s
t
merge example to r
e
cursive strategy
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C
Ha
m
ano
merg
e
-recurs
i
ve: match the unmerged
index entry behaviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Jun
i
o C Hamano
diff-files: show di
f
fs with
s
t
age0 and
u
nmer
g
ed stage
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
git-diff: do not turn off -p/-M with an
y
di
f
f options
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C Hamano
Mer
g
e ht
t
p:
/
/www
.
kernel
.
o
r
g/
p
ub/scm/gitk
/
g
i
tk
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
for
m
at-patch: run
d
i
f
f i
n
C locale
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C
H
amano
fo
r
mat-patch: d
o
not
abuse 3-dash marke
r
l
i
ne
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C Hamano
format-pat
c
h:
r
emove applies-to
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
H
amano
applypatc
h
: use "ind
e
x"
lines no
t
"applies
-
to"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C Hamano
a
pplymbox: t
y
pofix to enable -m option
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C Hamano
hash-object
.
c: type-fix to squelch compiler warnings
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C Hamano
define die() for scripts th
a
t use it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
verify-tag: make it ope
r
abl
e
from a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C Ham
a
no
t
a
g: make it
o
perable
f
r
om a subdi
r
ectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o
C Hamano
lost-fou
n
d
:
make
i
t
operable from a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ha
m
a
n
o
branc
h
: ma
k
e i
t
ope
r
able from
a
su
b
directory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C Hamano
ls-
r
em
o
te: define die()
n
o
w
we do not us
e
git
-
sh-setup
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ham
a
no
count-objects: make
it oper
a
b
l
e fr
o
m
a
subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
uni
o
C Hamano
Mak
e
the rest of comma
n
ds work from a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C Hamano
Ma
k
e networking commands to work
fro
m
a
subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
unio
C Haman
o
ls-tree: work f
r
om subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
ha
s
h
-
obje
c
t: work w
i
thin
subdire
c
tory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio
C
H
amano
checkout-in
d
ex: work from subdir
e
ctor
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
i
o C H
a
m
a
no
fsck-o
b
jects: work
f
rom subdir
e
ctory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
pee
k
-r
e
mote:
h
onor proxy config eve
n
from s
u
b
d
irector
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
i
o
C H
a
mano
git-
a
pply: work fr
o
m
s
ubdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Hamano
working from subdi
r
ectory: pre
p
ara
t
ion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Hamano
b
i
sect: q
u
ot
e
pathnames
f
or eval safety
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
n
i
o C Hamano
ls-tree: ma
t
ch the tes
t
t
o
t
h
e
n
ew s
e
mantic
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
i
o C
H
amano
l
s
-tree
:
R
es
u
rrect funny name quo
t
ing lost dur
i
ng rewrite
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ham
a
n
o
w
r
ite_na
m
e
_
quo
t
ed(): make one of the path
a counted
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
a
ma
n
o
Docume
n
tatio
n
: De
s
cribe merg
e
op
e
ration a bi
t
better
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
name-rev: f
i
x
parent co
u
n
t
ing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
rebase: o
n
e s
a
fety
n
e
t
, on
e
bugfix and
o
ne opti
m
ization
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
Merge h
t
t
p://www
.
kernel
.
org/pub/s
c
m/gitk/g
i
tk
commit
|
commitdiff
|
tree
2005-11-28
Ju
n
io C Hamano
git-mv: quo
t
e $src in reg
e
xp properl
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
J
u
ni
o
C Hamano
[
PATCH] gitk: Use
i18n
.
commitencoding configuratio
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Ju
n
io C Hamano
conf
i
g
.
c: constness tighte
n
ing to avoid compilatio
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Ju
n
io C Ha
m
ano
mail
i
n
fo:
D
o not use -
u
=<encoding>; say --encoding
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C
H
a
mano
m
ai
l
info: Use i
1
8n
.
commitencoding
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio
C
Haman
o
mailinf
o
: allow -u
t
o f
a
ll
b
ac
k
o
n l
a
tin1 to utf8 con
v
ersi
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Juni
o
C
H
a
mano
Int
r
oduc
e
i18n
.
com
m
itencoding
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio
C Hamano
Merge h
t
tp://www
.
kernel
.
org/pub/scm/gitk
/
g
itk
commit
|
commitdiff
|
tree
2005-11-27
J
unio C Hamano
s
e
tup_git_d
i
rector
y
(): check reposit
o
ry format v
e
r
sion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Ju
n
i
o C Ham
a
n
o
in
i
t-db: check templ
a
te and
re
p
ository format
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
Check rep
o
sitory format v
e
r
s
i
on in e
n
ter_repo()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C
Hamano
Repository format
v
e
r
sion check
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Jun
i
o
C
H
a
mano
format-p
a
t
ch: output fil
e
na
m
e reported to stdout
v
er
b
atim
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Hamano
name-re
v
: fix off
-
by-one e
r
ror in --stdin
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Hamano
shell
.
c
:
co
m
p
l
ain on insuff
i
c
ient
a
rgu
m
ents
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C
Hamano
git-sh
-
setup:
m
o
ve the reposi
t
ory check to a core progr
a
m
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Juni
o
C Hama
n
o
setup_git_dire
c
tory: make s
u
re GIT
_
DIR is a valid r
e
pository
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C H
a
m
a
no
git-var: m
a
ke
i
t
work in subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio
C
Hama
n
o
git-sh-setup: die if outside git repo
s
itory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
par
s
e
-
rem
o
t
e
a
n
d ls-remote clean-up
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Juni
o
C H
a
m
ano
Prevent "git
-
commi
t
-a path1 path
2
.
.
.
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next