repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: match the unmerged index entry behaviour with merge-resolve
2005-11-30
Ju
n
io C Hamano
merge-recursive: match t
h
e unmerged in
d
ex entry behaviour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio
C Hamano
di
f
f-file
s
: show
d
i
ffs wi
t
h stage0 and unmerged stage
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
L
i
nus
T
o
r
v
a
lds
mer
g
e-one-file: l
e
a
v
e
u
n
merged
i
nd
e
x
e
ntrie
s
upon automerge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Linus
T
orvalds
diff-fi
l
es: -1/-2/-3 to diff agai
n
st
u
nmerged stage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
J
u
ni
o
C Hamano
git-diff: do not turn
off
-p/-M with any diff option
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C Hamano
Merge
h
ttp://www
.
kernel
.
o
rg
/
pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-29
Ale
x
Riesen
[PATCH] Add tests for git-mv in
s
ubdirector
i
e
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Joha
n
nes Schindelin
[PATCH] Make git-mv work
in sub
d
ir
e
ctories, too
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
M
atthias Urlichs
SVN import
:
U
se one log call
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
jdl@free
s
cale
.
com
Fix typos
and minor format i
s
sues
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Nic
k
H
engev
e
ld
htt
p
-push clean
u
p
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Pavel Ro
s
kin
git-clone -
-
shared should i
m
ply --local
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Hamano
writ
e
_
n
a
me_quoted(
)
: 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
amano
Documentation: Descri
b
e merge
o
per
a
tion a bit be
t
t
er
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Jan Andres
Fix
typo in h
t
t
p-pu
s
h
.
c
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o
C Hamano
name-rev: fix paren
t
co
u
n
t
ing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Ham
a
no
reba
s
e
:
one safety net, one
b
ugfix
a
nd one opti
m
ization
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Ju
n
io
C Hamano
Me
r
ge http://www
.
kernel
.
o
r
g/
p
ub/scm/gitk/git
k
commit
|
commitdiff
|
tree
2005-11-28
Ju
n
io C
Hamano
git
-
mv: quote $
s
rc
i
n
regexp properly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Ham
a
no
con
f
ig
.
c: c
o
nstness tightening to avoid c
o
mpilation
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Ha
m
ano
mailin
f
o
:
D
o not
use
-
u=<encodin
g
>; say --encod
i
ng
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C H
a
m
a
n
o
mai
l
i
nfo: Use i
1
8n
.
c
ommiten
c
oding
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
J
u
nio
C
Hama
n
o
m
a
ili
n
fo:
a
llow
-
u to fall back on latin1 to utf8
conve
r
sion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Ha
m
ano
I
n
troduce i18n
.
commit
e
n
codi
n
g
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Ya
n
n Dirson
Fix git
k
this->selected diffs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio C H
a
mano
Merge htt
p
:
/
/ww
w
.
kernel
.
o
r
g/pub/scm/gitk/gi
t
k
commit
|
commitdiff
|
tree
2005-11-27
Josef Weidendorfer
git-mv: follow
-
k
request
e
ven on failing rena
m
e
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
J
osef Weidendorfer
Small fi
x
es in Documentati
o
n/g
i
t-mv
.
t
x
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Jos
e
f Weid
e
ndorfer
git-mv:
f
ully
d
etect 'di
r
ector
y
mo
v
ed into
i
tself'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Josef
W
eidendorfer
git-mv: keep git index cons
i
st
e
n
t
with file system
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Josef Weidendorfe
r
git-mv: shrink usage
,
n
o
usage on er
r
or
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Ju
n
io C Hamano
setup_git_d
i
rectory():
c
h
e
c
k repository format v
e
rsion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
init-db: check template and
r
epository format
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hama
n
o
Ch
e
ck repo
s
itory format vers
i
on i
n
enter_re
p
o()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Ju
n
io C Haman
o
Repos
i
to
r
y
f
o
rmat v
e
rsion check
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Hamano
format-
p
atch:
o
utpu
t
f
i
lena
m
e reporte
d
t
o stdout v
e
rba
t
im
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Junio
C
H
a
mano
n
a
me-
r
ev: fix off
-
by-one error in --
s
tdin
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
A
lexander Litv
i
nov
g
it-
m
v is not able to
h
andle big director
i
es
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Junio C
Hamano
shell
.
c: compla
i
n on i
n
su
f
ficient arguments
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Ju
n
io C Ham
a
no
git-sh-setu
p
: move t
h
e repository check to a core program
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C
H
amano
setup_
g
it_dir
e
ctory
:
make
s
ure GIT_DIR is a valid repository
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Juni
o
C Ha
m
a
no
git-var: make
i
t
work i
n
subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Haman
o
git-sh-setup:
die if out
s
id
e
git reposito
r
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
p
arse-remote
a
n
d
ls-rem
o
te clean-up
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
J
unio C
Hamano
Prevent "gi
t
-co
m
mit
-a
path1 path2
.
.
.
"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Juni
o
C
Hamano
con
f
ig
.
c: avoid shadow
i
ng global
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
YOSHIFUJI Hi
d
eaki
.
.
.
Fix a warning about u
n
us
e
d v
a
l
ue
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Andre
a
s Erics
s
on
cvsimport: D
o
n't
l
et loc
a
l setti
n
gs
h
inder cvs us
e
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
Johannes Sc
h
indeli
n
Rename git-config-set t
o
g
it-re
p
o-c
o
nfig
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
Junio C Ha
m
ano
diff-tr
e
e: te
a
ch s
i
ng
l
e-
c
ommit diff-tree to ho
n
o
u
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
J
un
i
o
C Hamano
Teach update-index to re
a
d fr
o
m ls-t
r
ee
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
J
u
n
i
o
C Hamano
git-revert: make --edit default
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
Li
n
us Torvalds
Allo
w
editing of a revert-message
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
Josef Weide
n
d
orfer
Fix git-mv for m
o
ving directories with 1 file
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
Ju
n
io C Hamano
g
i
t
-merge:
m
ake recursive the default strategy
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
Jun
i
o
C Hamano
pack-redu
n
dant
:
t
y
pe
cl
e
anups
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-22
Paul Serice
F
i
xed git
:
// IPv4 add
r
ess prob
l
em when compiled wi
t
h
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-22
Ale
x
Riese
n
a
rguments
cleanup and some formatting
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-22
Alex Riesen
rem
o
ve unused
v
ariable
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-22
Alex R
i
es
e
n
speedup alloca
t
i
on in pack-re
d
unda
n
t
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-22
Lukas Sandst
r
öm
Make g
i
t-pack-redundant t
a
ke a
lis
t
of unimport
a
nt
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-22
Junio C H
a
m
ano
M
e
rge http://www
.
kerne
l
.
or
g
/pub/
s
cm/gitk/gi
t
k
commit
|
commitdiff
|
tree
2005-11-22
Junio C
Hamano
g
i
t
-v
a
r: constness and g
l
obalness clean
u
p
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-22
Junio C Hamano
Move d
i
ff
.
renamelimit out o
f
d
e
f
ault c
o
nfigurati
o
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-22
Luben Tuikov
max-c
o
unt in terms o
f
intersection
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-22
YOSHIFUJI
Hideaki
.
.
.
GIT
:
Fi
x
compilation error in connect
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-22
A
n
dreas Er
i
csson
Introduce $
(
ALL_
P
ROGRAMS
)
for 'all:' and 'install:
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
H
.
Peter Anvi
n
r
enam
e
/c
o
py score parsing updates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Paul
Seric
e
git-daemon
not listenin
g
when compi
l
ed with
-DNO_IPV6
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Linus Torv
a
lds
g
i
t-repack: Properl
y
abort in corrup
t
repos
i
tory
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Johanne
s
Schindelin
Allow hierarchic
a
l s
e
c
t
ion names
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Johannes
Sc
h
indelin
git-
c
onfig-
s
et
:
Pr
o
perly te
r
minate strings with '\0'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Juni
o
C Hamano
gi
t
-proxy updates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Paul Collins
proxy-command sup
p
ort for g
i
t:/
/
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Junio C Ha
m
ano
daemon: further t
w
e
aks
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Andr
e
as Er
i
csson
git
-
da
e
mon suppo
r
t
f
or u
s
er-relative paths
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Junio C Hamano
tutorial: setting
up
a
tree
for sub
s
y
s
tem maintai
n
er
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Junio
C Hamano
rename detect
i
on
w
ith -
M
100 means
"
e
xa
c
t r
e
name
s
only"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Junio
C
Hamano
forma
t
-patch:
f
ix two-argumen
t
speci
a
l ca
s
e, and m
a
k
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Junio C Hamano
F
ix
hooks/update templ
a
te
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
J
u
nio
C
H
a
m
ano
Ma
k
e
s
ure heads/foo and ta
g
s/
f
oo
d
o not confu
s
e things
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Junio C Hamano
Fix "do not DWIM" patch to
ente
r
_repo"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Andreas Ericsson
g
i
t-rese
t
.
t
xt:
Small f
i
x + clarif
i
ca
t
i
o
ns
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Ryan A
n
derson
Add
P
y
thon ve
r
sion checks to
t
he Makefile to automatically
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Timo Hir
v
onen
Fix sparse wa
r
nings
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
Junio C Hamano
Merge http://www
.
kernel
.
org/pub/
s
cm/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-20
Jo
h
annes Schind
e
lin
g
it-config-se
t
: support
sele
c
ting values by non-
m
at
c
hing
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
Fredrik Kuivinen
me
r
ge
-
r
e
curs
i
ve: Rep
l
a
c
e '
e
xcept:'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
Junio C Hamano
merge-one-f
i
le: use rmdir -
p
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
J
un
i
o C
H
a
mano
D
ocume
n
tation: add hooks/update exam
p
le
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
Jo
h
annes Schin
d
elin
git-c
o
nfig-set: ad
d
m
ore options
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
And
r
eas Ericsson
D
ocumentatio
n
upd
a
te for user-re
l
ative paths
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
And
r
eas Eric
s
son
Clien
t
side
su
p
p
o
rt for user-re
l
ativ
e
path
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
Andreas Erics
s
on
Serv
e
r-side sup
p
ort for
us
e
r
-relative paths
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
Junio C
H
a
mano
Do
not D
W
IM in userpath library
under strict mode
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
Andre
a
s
Ericsson
Library code for user-relative paths, take t
h
r
ee
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
J
ohannes Schindeli
n
A
d
d
test c
a
se for
g
i
t
-
config-se
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
Joh
a
nnes
S
ch
i
ndelin
A
d
d documentation f
o
r git-config-set
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
J
oha
n
nes
S
chindelin
Add git
-
c
onfig-set, a simple helper
f
or
s
cripts t
o
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
J
o
hannes Schindelin
Add functions git_config_set() an
d
git_config_s
e
t
_
multivar()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next