repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation: not learning core git commands.
2005-12-02
Junio C
Hamano
git-merge doc
u
mentat
i
on: conflicting merge leaves h
i
gher
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
merg
e
-one-file: ma
k
e su
r
e
we d
o
not mi
s
mer
g
e sy
m
bolic
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
J
unio
C Hamano
mer
g
e-on
e
-
f
ile:
make sure we c
r
eate th
e
merged file
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio
C
Ha
m
a
no
t3100: add ls-tree -t an
d
-d tests
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Jun
i
o C Hamano
merge-recurs
i
ve: adjust git-ls-tree use for the
l
atest
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Al
e
x Ries
e
n
git wrap
p
er: more
careful arg
u
ment stuffing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Haman
o
git-
m
e
rge-one-file: do not w
o
rry about '
r
mdi
r
-p' not
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Jun
i
o C Ham
a
no
ls-tree: -
-
name-only
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Ha
m
an
o
ls-t
r
ee:
resurr
e
ct '-d' to
m
e
a
n 'show trees only
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Linus Tor
v
a
l
d
s
git
-
ls
-
tree: add "-t" option to always sho
w
the tr
e
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Ju
n
io
C
H
am
a
no
Makefile: say the defau
l
t target upf
r
o
nt
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
J
u
nio C
H
amano
Documentation
:
describ
e
'-f' o
p
t
ion
to git
-
fetc
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
T
i
mo Hirv
o
nen
Move couple of ifdefs aft
e
r "include co
n
fig
.
mk"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
Me
r
ge branch 'jc/subdir'
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
Merge branches 'jc/apply',
'
lt/ls-tree'
,
'lt/bisect
.
.
.
commit
|
commitdiff
|
tree
2005-11-30
Tommi Virta
n
en
Do
n
ot
a
ttempt
to
access literal
d
irname
"
GIT_OBJE
C
T_DIREC
T
ORY"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C
H
aman
o
Tutorial: adjust merge example to recursive strategy
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
mer
g
e-recursive: match the unmer
g
ed i
n
d
ex e
n
try be
h
avi
o
u
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Ham
a
no
diff-fi
l
es: show
d
if
f
s with stage0 and unmerged s
t
ag
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Linus Torvald
s
merge-on
e
-f
i
l
e
:
lea
v
e unme
r
ged index
e
ntries upon automerge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Linus Torvalds
diff-files: -1/-2/-3 to di
f
f against unme
r
g
e
d
stage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
git-diff:
d
o not turn off -p/-M wit
h
any d
i
ff optio
n
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
H
amano
Merge http://www
.
kerne
l
.
org/pub/scm/gitk
/
gitk
commit
|
commitdiff
|
tree
2005-11-29
Alex
R
i
esen
[
P
ATCH] Add tests f
o
r git-m
v
in subdirecto
r
ies
Junio C Hamano
, Sat, Nov 26, 2005 03:45:52 +0100:
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Joh
a
nnes Schindelin
[P
A
TCH] Make git
-
mv w
o
rk in subdirect
o
rie
s
,
too
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Hamano
format-pa
t
ch: ru
n
diff in C locale
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C H
a
mano
form
a
t-pa
t
ch: do not a
b
use 3-dash marker li
n
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Ha
m
a
no
format-patch
:
remove applies-to
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io
C Ha
m
ano
apply
p
atch:
use "index" line
s
not "applies-
t
o"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
app
l
ymbox: typofix 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
se
o
ne log c
a
ll
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
jdl@freescale
.
com
Fix typos and minor format issues
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Nic
k
Hen
g
eveld
http-push c
l
eanu
p
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Pa
v
el Roskin
git-clo
n
e -
-
shared shoul
d
i
mply
-
-loca
l
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
ha
s
h-object
.
c
:
type
-
fix
t
o sque
l
ch compiler warnings
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
define
d
ie(
)
for scr
i
pts that use it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Hamano
verify-tag:
m
a
ke it operab
l
e from a sub
d
irec
t
o
r
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C Hamano
tag:
m
a
k
e
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-f
o
und: m
a
k
e
it operable from a su
b
directory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Haman
o
branch
:
make it opera
b
le from a subdir
e
c
t
ory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
amano
ls-remote
:
define die()
n
o
w we d
o
not us
e
git-sh
-
s
etup
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C Hamano
c
ount-
o
bjects
:
make it o
p
erable from a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Ha
m
a
no
Make
t
he re
s
t
of commands
work 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
M
ak
e
n
e
tworking
c
ommand
s
to
work f
r
om a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
n
i
o
C H
a
mano
ls-tree: 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
hash-object: work within subdirecto
r
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Hamano
checkout-
i
ndex: work from subdire
c
to
r
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
H
a
mano
fsck-o
b
jects:
work
from subd
i
rectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
peek-remote: hon
o
r proxy
c
onfig
even from su
b
di
r
ectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ham
a
no
gi
t
-ap
p
ly: work fr
o
m subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io
C Hamano
working from subdirecto
r
y: prep
a
ration
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
amano
bise
c
t: q
u
ote
p
athname
s
for eval safety
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
L
i
nus Torva
l
ds
bisect: limi
t
the sea
r
chspace by pa
t
hspecs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
amano
ls-tree: match the te
s
t
t
o the new semanti
c
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Hamano
ls-
t
ree
:
Resurrect
funn
y
name quoting
l
ost
d
uring rewrite
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Linus T
o
r
v
al
d
s
ls-tr
e
e: furthe
r
t
weaks of the rewrite
commit
|
commitdiff
|
tree
2005-11-29
Linus To
r
v
alds
ls-tree:
f
urther c
l
eanup
t
o paral
l
el ls-files
.
commit
|
commitdiff
|
tree
2005-11-29
L
i
nu
s
T
o
r
valds
ls-tree: maj
o
r re
w
rit
e
to do pathspec
commit
|
commitdiff
|
tree
2005-11-29
J
unio C Haman
o
w
r
ite_name_quoted(): make one of the path a c
o
unte
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
Docu
m
entation: Describe
m
e
rg
e
operation
a
bit better
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Jan Andr
e
s
F
ix typo i
n
h
t
tp-push
.
c
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
name
-
rev: fix parent c
o
unting
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
r
e
base: on
e
safety ne
t
,
o
ne bugfix
a
nd one optimiz
a
ti
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
Merge
h
ttp://www
.
ke
r
nel
.
o
r
g/pub/scm/g
i
tk/git
k
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
git-mv: quote $src
i
n re
g
exp properly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
config
.
c: constness ti
g
h
t
e
ning to av
o
id com
p
i
l
ation
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
J
u
nio C Hamano
m
a
i
linfo: Do not use -u=<encoding>; say --encoding
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
J
u
nio
C
Haman
o
m
a
i
l
info: Use i18n
.
commi
t
encoding
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C
Hamano
ma
i
linfo: allow -u to
f
all back
o
n latin
1
to utf8 conve
r
sion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
J
u
nio C Hamano
In
t
r
o
duce i18n
.
c
ommitencoding
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Yann D
i
rson
Fix
gitk
th
i
s->
s
elec
t
ed di
f
fs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
Merge http://www
.
kernel
.
org/pu
b
/scm/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-27
Josef Weidendorf
e
r
gi
t
-mv: follow -k request even on failing r
e
nam
e
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Jos
e
f Weidendorfer
Small
f
i
xes in Document
a
tion/gi
t
-mv
.
txt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Josef Weidendorfer
git-
m
v
:
fully detec
t
'directory moved in
t
o i
t
s
elf'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Josef Weid
e
ndorfer
git-
m
v: keep git index co
n
sistent w
i
th file system
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
J
o
sef
W
eid
e
ndorfer
git-mv: shrink usag
e
, no usage on error
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Ha
m
ano
se
t
up
_
gi
t
_
d
i
rectory():
check reposi
t
ory
format versio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
J
u
nio C
Haman
o
init-db
:
check te
m
plate
and
repository format
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Ju
n
io C Hamano
Check rep
o
sitory f
o
rmat version i
n
enter_repo()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Juni
o
C Hama
n
o
Repository fo
r
mat version
c
heck
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Junio C
Hamano
f
o
rm
a
t-pat
c
h
: output filename r
e
ported to stdout verbatim
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
J
u
nio
C
Ha
m
a
n
o
name-rev: fix
o
ff-by
-
one e
r
ro
r
in --stdin
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
A
l
exand
e
r L
i
tvinov
git
-
m
v
is
not able to handle big dire
c
tories
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Hamano
s
hell
.
c
:
complain on insufficien
t
arguments
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Ju
n
i
o C
H
amano
gi
t
-sh-set
u
p: move th
e
repository
c
h
eck to a core program
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Ju
n
io
C
H
a
mano
s
etup_git_direc
t
ory: ma
k
e
s
ure
G
IT_D
I
R
i
s a
v
alid rep
o
sito
r
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio
C
Hamano
git-va
r
: m
a
ke
it work in subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Ju
n
io C Hamano
g
i
t-sh-
s
e
t
up:
d
ie if outsid
e
git repos
i
tory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
parse-remot
e
an
d
ls-remote cle
a
n-up
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
Preven
t
"git-commit -a path1
p
a
t
h
2
.
.
.
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C
Hamano
config
.
c: avoid shadowin
g
g
l
obal
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Y
O
S
HIFUJI Hidea
k
i
.
.
.
Fix a warning about unused value
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Andreas
E
r
i
csson
c
v
s
i
mport
:
Don't let
loc
a
l
settin
g
s hinder
c
vs us
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
J
o
han
n
es Schindelin
Rena
m
e git-c
o
n
f
ig-set to gi
t
-repo-
c
onfig
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Ju
n
i
o
C Hamano
diff-tree
:
t
each s
i
ng
l
e-commit diff-tre
e
to honour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Junio C Hamano
Teach u
p
da
t
e-index to
r
ead
from ls-tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Junio C Hamano
git
-
r
evert: make --
e
dit defa
u
lt
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
L
i
nus Torvalds
Allow editi
n
g of a revert-mes
s
a
ge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Jos
e
f Weidendorfer
Fix
g
i
t-mv for
mo
v
i
n
g directori
e
s wi
t
h
1 file
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next