repo.or.cz
/
git
/
vmiklos.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
H
amano
git-merge-one: new
m
erge
w
orld order
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-07
J
u
ni
o
C Ham
a
no
che
c
k
o
ut-index: allow ch
e
cking out from hi
g
h
e
r
s
ta
g
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-07
Jason
R
ie
d
y
Use printf rat
h
er th
a
n echo -n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-07
Juni
o
C Hama
n
o
q
sor
t
(
)
p
t
rdiff_t may
b
e large
r
than
int
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-07
Ja
s
o
n
Rie
d
y
[PAT
C
H] Initial AIX portabili
t
y fixes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-06
Ju
n
io C
H
amano
git-merge-on
e
-file: resurrect
l
eading path c
r
ea
t
i
o
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-06
Junio C Hamano
D
ocumen
t
ait
o
n (read-tree)
:
u
pdate desc
r
i
p
t
ion
of 3-way
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-06
Jun
i
o
C Hamano
Documentation:
h
ash-objec
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-06
J
u
n
i
o
C
Hamano
write-tre
e
:
ch
e
ck e
x
tra argume
n
ts and die but be
a
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-06
Juni
o
C Hamano
i
n
i
t
-db: chec
k
extra
a
r
guments and compl
a
in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-06
J
u
nio C Hamano
h
ash-objec
t
:
-
- an
d
--h
e
l
p
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-06
Jo
n
L
oelige
r
A
d
ded documentation
f
or
few missing op
t
ions
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-06
Junio C Hamano
git-
m
v
to work
w
ith
Perl
5
.
6
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-06
Ju
n
io C Hamano
Fix 5501
test
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio C H
a
mano
C
lean u
p
compatibi
l
i
t
y de
f
in
i
tions
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Jason Riedy
[PA
T
CH] Docu
m
ent config
.
mak in
INST
A
LL
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio
C
H
a
mano
config
.
c:
r
emove unnec
e
s
sary header in mi
n
imum
c
onfigu
r
ation
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
server-in
f
o
.
c:
a
n
d
two fun
c
t
ions are not used anymor
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Haman
o
server-
i
nfo
.
c:
use pack_lo
c
al like eve
r
ybody else
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
J
unio C Hama
n
o
Documentation: share
d
repository man
a
gement
in tutorial
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
Document
a
tio
n
: push
/
receive hook re
f
er
e
n
c
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
Documentation:
g
it-diff asciidoc table workaround
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
J
unio C Ham
a
no
Documentation: g
i
t
-mv manpage workaround
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
Documentation: talk abou
t
pa
t
hspec in
b
i
sect
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio C
H
a
m
a
no
server-info:
t
hrow away T computation a
s
wel
l
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio C H
a
mano
server-info
:
sto
p
sor
t
ing packs b
y
latest dat
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Juni
o
C
H
amano
server-info
.
c
: d
r
op unu
s
ed
D
lines
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
sha1_f
i
l
e
.
c: make s
u
r
e
packs in an a
l
t
ernate odb
is
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Ham
a
no
git
.
c: remove excess outpu
t
f
o
r debug
g
ing when com
m
and
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
J
u
n
i
o C
H
amano
st
r
uct tree: remove unused f
i
e
l
d "parent"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
Documen
t
ation: rebas
e
doe
s
no
t
use
c
herry
-
pick anymore
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Petr B
a
udis
Do
c
ument the --(no-
)
e
d
it switc
h
of
g
i
t
-
r
eve
r
t and git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Jun
i
o C Hamano
show-branch: allow g
l
ob
p
attern
t
o name branch
e
s to
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Petr Ba
u
d
is
Updat
e
the git
-
ls-tree documen
t
ation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-04
J
u
nio
C Haman
o
git
.
c: two fixes, gitsetenv
t
ype and of
f
-by-one
e
rror
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-04
Junio C Hamano
compat/setenv
:
d
o not free what we fed p
u
tenv(3)
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-04
Daniel Bar
k
alow
W
a
r
n w
h
en
send-pack does nothing
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-04
Junio
C Hama
n
o
[PATCH] daemon
.
c
and path
.
ent
e
r
_
repo(): revamp p
a
th
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-04
H
.
Peter An
v
in
A few mo
r
e options for git-cat-
f
ile
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-04
Ja
s
on Riedy
Add compa
t
/se
t
en
v
.
c,
use in
g
i
t
.
c
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivin
e
n
New test cas
e
:
C
riss
-
cross merge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
N
ew test
case
:
merge
w
ith directory/file conflicts
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-03
Fred
r
ik
K
uiv
i
nen
t
est-li
b
.
sh: Add new funct
i
on, tes
t
_ex
p
ect_
c
ode
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Ku
i
vinen
git
-
merge: Exit wi
t
h cod
e
2 if no
strategy was ab
l
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
No name
doc
u
mentation: git-t
a
g
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
documentat
i
on: gi
t
-bisect (help
H
TML brea
k
m
a
n
)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
No nam
e
docu
m
entation:
c
larify
r
ead-tr
e
e
--reset
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Ham
a
no
git-merge documentation: conflicting merge leave
s
higher
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Ham
a
no
m
e
r
g
e-one
-
file:
m
ak
e
s
ure w
e
d
o
not mism
e
rge
symbolic
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio
C
Ham
a
no
merg
e
-one-file: ma
k
e sure we cr
e
ate t
h
e
merge
d
file
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
J
u
ni
o
C Ham
a
no
t
3
1
0
0: add
l
s-tree -t a
n
d -d test
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Haman
o
merge-recursive
:
adju
s
t git-ls-tree use for the l
a
t
est
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
A
lex
Riesen
git
w
r
a
p
per: more careful a
r
g
u
ment stuf
f
ing
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C
Hamano
git-
m
erge-one-fil
e
: do not worry about '
r
m
d
ir
-
p
' not
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Ju
n
io C Hamano
l
s-
t
re
e
:
--name-
o
nly
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Juni
o
C Hamano
ls-tr
e
e: resu
r
rect '-d' to mean
'
show tree
s
only'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Linus Torvalds
g
i
t
-
ls-tr
e
e:
a
d
d "-t" opti
o
n
to a
l
ways sh
o
w the tr
e
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
J
u
nio C Hamano
Mak
e
file: say th
e
defa
u
l
t
target upfr
o
nt
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
J
un
i
o C
H
amano
D
ocumentation
:
describe '-f' opti
o
n to gi
t
-fetch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Tim
o
H
irvonen
Move couple of i
f
defs
a
f
t
er
"
in
c
lu
d
e
c
onf
i
g
.
mk"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Jun
i
o C Hamano
Merg
e
branch 'jc
/
subdir'
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
Merge branches 'jc/apply', 'lt/ls
-
tree', '
l
t/bisect
.
.
.
commit
|
commitdiff
|
tree
2005-11-30
To
m
mi Virt
a
nen
Do not att
e
mpt to access li
t
eral dirname "GIT_OBJECT_DIRECTORY"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
J
u
n
io C
Ham
a
no
Tutorial: a
d
jus
t
merge example to recu
r
si
v
e
s
trateg
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Juni
o
C Hama
n
o
merge-re
c
ursive: match the
unmerged index entr
y
behaviour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Ju
n
io C
H
a
man
o
d
iff-fil
e
s:
s
how diffs with stage0 and unmerged
stage
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Lin
u
s
T
orval
d
s
merge-one-file: leave unmerged index entries upon automerge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Linus T
o
rvalds
di
f
f-files: -1
/
-2/
-
3
to diff against unmerg
e
d stage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
git-diff: do not turn
o
f
f
-
p
/
-M
w
i
t
h a
n
y diff options
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C Hama
n
o
M
e
rge http://www
.
kerne
l
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-29
Alex Rie
s
e
n
[PATCH] Add
t
ests for git-
m
v in subdire
c
tories
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Johannes S
c
hindelin
[
PATCH] Make git-mv work in subd
i
rectories, too
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
format
-
patch: run diff
in C locale
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Hamano
f
o
rmat-p
a
t
ch: do not abuse 3-das
h
marker line
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C Ham
a
n
o
format-patch: remove applies
-
to
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Hamano
appl
y
patch: u
s
e "inde
x
"
l
i
ne
s
not "appl
i
es-to"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Hama
n
o
a
p
plymb
o
x: typof
i
x to enable -m optio
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Matthias Urlichs
SVN
im
p
ort: U
s
e o
n
e lo
g
ca
l
l
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
j
d
l@free
s
cale
.
com
F
ix typos and
m
i
n
or form
a
t issue
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
N
ick Hengeveld
http-push cleanup
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Pavel
R
oskin
git-
c
lone
--sha
r
ed sh
o
uld
imply
-
-loc
a
l
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io
C
Hamano
ha
s
h-objec
t
.
c: ty
p
e
-fix
t
o squelch co
m
pi
l
er warnin
g
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C Hamano
define die() for scripts t
h
at use i
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Haman
o
v
erify-tag: make
i
t operabl
e
f
rom a
subdirecto
r
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Hamano
tag: make
i
t
operab
l
e
from a subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ha
m
ano
lost-fo
u
nd
:
make it operable from a
subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C Hamano
br
a
n
c
h: m
a
ke it operable fr
o
m a subd
i
rector
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ham
a
no
ls-remote: def
i
ne die()
n
ow we do not
u
s
e
g
it-sh-
s
etup
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
count-o
b
jects: make it
op
e
rable from a subdirecto
r
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C Ham
a
no
Make the r
e
st
o
f
co
m
mands
w
ork from a su
b
directory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
amano
Ma
k
e ne
t
wor
k
ing commands t
o
work from a su
b
d
irect
o
ry
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
uni
o
C Haman
o
ls-tree:
w
ork from subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
ni
o
C Hama
n
o
h
ash-objec
t
: work
within subdirec
t
ory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C Hama
n
o
checkout-index: work
from
sub
d
irectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
f
sck-objects: wo
r
k from subd
i
rectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C H
a
mano
p
e
ek-remote: honor proxy
c
onfig e
v
e
n
from s
u
bdirector
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C Hama
n
o
git-apply
:
wor
k
from s
u
bdirect
o
ry
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
working from subdirectory: prepar
a
tion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Ha
m
ano
bisec
t
:
quote pathnames fo
r
e
v
al safety
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Linus Torvalds
bisect: l
i
m
i
t the searchspace by pathsp
e
cs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next