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
Tutorial: adjust merge example to recursive strategy.
2005-11-30
Ju
n
io
C Hamano
Tutorial: ad
j
ust merge example
t
o recursive
st
r
ategy
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Jun
i
o C Ham
a
n
o
merge
-
rec
u
rsive: match the unmerged index entry behaviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Ha
m
ano
diff-fil
e
s
: s
h
o
w
d
if
f
s with stage0 and
u
nmerg
e
d s
t
age
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Linus
T
orv
a
lds
merge-one-file: lea
v
e
u
nmer
g
ed index e
n
tr
i
es
upon
autome
r
ge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Linus Torv
a
lds
d
i
f
f-
f
ile
s
:
-
1/-2/-3 to diff against unmer
g
ed s
t
age
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Jun
i
o
C
Hamano
git-
d
iff: d
o
not
t
urn off -p/-M with a
n
y
d
i
ff op
t
ions
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C
H
amano
Me
r
ge ht
t
p:
/
/www
.
kernel
.
o
rg/
p
ub
/
scm/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-29
Alex
Riesen
[
P
A
T
C
H] Add tests
f
or git-mv in subdire
c
tories
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
Johannes S
c
hindeli
n
[PATCH] Make
g
it-mv wo
r
k in
su
b
directories, too
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Matthias Urlichs
SVN import: Us
e
one log call
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
jdl@f
r
eesca
l
e
.
com
F
ix typos an
d
mi
n
or format issues
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Nick Hengeveld
http-push cleanup
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Pavel Roskin
git-clone -
-
shared
should
i
mp
l
y -
-
local
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
write_name_quoted()
:
make one o
f
the path a co
u
nted
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hama
n
o
Documentation: Describe merge o
p
erat
i
on a bit
b
etter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Jan Andr
e
s
Fix typo i
n
http-push
.
c
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C
Hama
n
o
name-rev: fix parent counting
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
rebase: on
e
sa
f
ety net
,
o
ne bugfix and one optimizatio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
J
u
n
i
o
C
Ha
m
ano
Merge http://www
.
kernel
.
org/pub/scm/gi
t
k/gitk
commit
|
commitdiff
|
tree
2005-11-28
Junio
C Hamano
git-mv: quo
t
e $src
i
n regexp p
r
operly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
config
.
c
: constness tigh
t
e
ning to avoid compilatio
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
mailinfo: Do n
o
t use -u=<encodi
n
g>
;
say
-
-
e
nc
o
ding
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
J
u
nio
C Hamano
ma
i
linfo: Use
i
1
8n
.
c
o
mmiten
c
odin
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Ham
a
no
mailinfo: allo
w
-u t
o
fall back on latin
1
to u
t
f
8
conv
e
rsion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
Int
r
oduce
i
18n
.
c
o
mmitenc
o
ding
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Y
a
nn
D
irso
n
Fix git
k
this->sel
e
cted diff
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Haman
o
Merge http://www
.
kerne
l
.
o
rg/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-27
Jose
f
Weid
e
ndorfer
git
-
mv: follo
w
-k request even
o
n failing renames
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Josef W
e
id
e
n
d
o
rfe
r
Small fixes in
Docu
m
entation/git
-
mv
.
txt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Josef Weidendorfer
git-mv: fully detect 'directory moved
into itself'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Jo
s
e
f
Weidend
o
rfer
git-mv: k
e
ep git in
d
e
x
consi
s
te
n
t with file
s
ystem
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Josef Weidendor
f
e
r
git-mv: shri
n
k
usa
g
e,
n
o u
s
a
ge on
error
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Ju
n
i
o C Ham
a
no
setup_g
i
t_
d
i
rectory(): check repo
s
it
o
ry
format version
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C
H
amano
init-db: check
t
emplate and repository format
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
J
unio C Haman
o
Check
r
e
p
o
s
it
o
ry
forma
t
version in enter_
r
e
po()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
J
unio C
H
amano
Repositor
y
fo
r
mat version ch
e
ck
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Hama
n
o
f
orma
t
-patch: output filename rep
o
rted to
stdout v
e
rbatim
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Ju
n
i
o
C
H
amano
n
a
me
-
rev: fi
x
off-by-o
n
e error in --stdin
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Al
e
x
ander Lit
v
in
o
v
git-mv is not able to handle big di
r
ectories
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Hamano
shell
.
c: co
m
plain on insuff
i
cient arguments
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
J
u
n
io
C
H
amano
git-sh-setup: move the rep
o
sitory check
to a core program
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Jun
i
o C Hamano
setup_git_directory: mak
e
sure GIT_DIR is a valid repository
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C
Hamano
g
it-va
r
: make it work in subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
g
it-
s
h-setup:
d
i
e
if outside git re
p
o
s
ito
r
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Juni
o
C Ha
m
ano
parse-remote an
d
l
s-remote
c
lean-up
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
J
u
nio C Hamano
Prevent "git-commit
-
a
path1 p
a
th
2
.
.
.
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
config
.
c: avoid
s
h
a
dowing global
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
YOSHIFUJI Hi
d
e
a
k
i
.
.
.
Fix a warning abou
t
unused value
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Andr
e
as
Ericss
o
n
cvsimport: Don't let local settings hinder
cvs user
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Johan
n
es Schindeli
n
Ren
a
me git-config-set to git-repo-
c
onfig
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Ju
n
io
C Ham
a
no
dif
f
-tree: te
a
ch
single-commit
d
iff-tr
e
e to honour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Junio C Hamano
Teach update-index to read from ls-tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Junio C Ham
a
no
git-revert: make
-
-edit
d
efaul
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Linus Torval
d
s
Allow editing
of a revert-
m
essage
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Josef Weidendorfe
r
Fix git-mv
for
m
o
v
i
n
g directories
w
ith 1 fi
l
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Ju
n
io C H
a
ma
n
o
git-merge:
make recursive the d
e
fa
u
l
t stra
t
e
g
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Junio C Hamano
p
a
ck-redun
d
ant:
t
y
pe clea
n
ups
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
Paul Seric
e
Fixed git:// IPv
4
addre
s
s problem wh
e
n compile
d
w
i
th
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
A
l
e
x
Riesen
a
r
guments
c
leanu
p
and
s
om
e
formatting
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
Alex
R
i
esen
remov
e
unu
s
ed variable
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
Alex Ri
e
sen
sp
e
edup alloc
a
tion in pac
k
-
redundant
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
L
ukas Sa
n
dströ
m
Make g
i
t
-
pack
-
red
u
ndant tak
e
a list of unimportan
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
J
unio C Hama
n
o
M
erge http://www
.
k
e
rnel
.
org/pub/
s
cm/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-22
Junio C Hamano
gi
t
-var: co
n
s
tn
e
s
s
and g
l
obalne
s
s clea
n
up
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
Junio C Hamano
Move diff
.
r
enamelimit
o
ut of default configurati
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
Luben Tuikov
max-count in terms of intersection
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
YOSHIFUJI
H
i
deaki
.
.
.
GIT: Fix comp
i
lation
error in connect
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
Andreas Er
i
css
o
n
Intro
d
uce $(
A
L
L
_PROGRAMS) fo
r
'all:' an
d
'install
:
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
H
.
Pet
e
r Anvin
rena
m
e/cop
y
score parsing
u
pd
a
t
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Paul Seric
e
git-daemon not
lis
t
ening when
compile
d
with -DNO_IPV6
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Linu
s
To
r
valds
g
i
t-repack: Pro
p
erly
a
bor
t
i
n
co
r
rup
t
repository
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Jo
h
a
nnes
S
chindelin
Al
l
ow h
i
erarc
h
ic
a
l
s
ecti
o
n names
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Joh
a
nnes S
c
hind
e
lin
git-config-set: Properly
t
erminate string
s
w
ith '
\
0'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Juni
o
C Ham
a
no
git-prox
y
upda
t
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Paul Colli
n
s
proxy-co
m
mand supp
o
rt for git:/
/
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Junio C
Hamano
daemo
n
: fur
t
her
t
weaks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
A
ndreas Eri
c
sson
g
it-daemon support
for use
r
-relative paths
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Juni
o
C Ha
m
a
n
o
tutoria
l
:
set
t
ing up a
tree for s
u
bs
y
st
e
m mai
n
taine
r
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
J
unio C Hamano
rename detection with -M100 m
e
ans "ex
a
ct renames only"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Juni
o
C Hamano
f
o
rmat-patch: fix
t
wo-argument special
c
ase, an
d
make
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Jun
i
o C Hamano
Fix hooks/updat
e
templ
a
te
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
J
u
nio C Hamano
Make
su
r
e heads/foo and tags/foo
do no
t
confuse things
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Junio C Hamano
Fix "do not
DWIM" pat
c
h to
e
n
ter_repo"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Andreas Ericsson
git-re
s
et
.
tx
t
:
Small fix
+
clarificatio
n
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Ryan Anderson
A
dd Py
t
hon ve
r
sion checks to
t
h
e
Makefile to a
u
t
o
matically
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Ti
m
o Hir
v
on
e
n
Fix sparse warnings
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
J
u
n
io C Hamano
Merge http:
/
/www
.
kernel
.
org/pub
/
scm/gitk/
g
it
k
commit
|
commitdiff
|
tree
2005-11-20
Johannes Schi
n
delin
git-config-set: support selecting values by non-ma
t
ching
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Fredr
i
k Kui
v
i
nen
merg
e
-recursive: Repl
a
ce 'except:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Junio
C Hamano
me
r
g
e
-
one-fil
e
: use rmdir -p
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Junio C Hamano
Documen
t
ation: add ho
o
ks/update example
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Jo
h
a
n
nes Schindelin
git-co
n
fig-set: add more opti
o
n
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Andreas Er
i
csson
D
o
c
umentation up
d
ate for
u
ser-rel
a
tive p
a
t
hs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
A
n
dreas
E
ricsson
Clien
t
side suppo
r
t for user-re
l
ative paths
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Andrea
s
E
r
i
csson
Ser
v
er-side su
p
port for user-relative paths
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
J
unio C
H
a
mano
Do
n
o
t
DWIM in u
s
erpath library
u
nd
e
r strict mode
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Andreas E
r
icsson
Li
b
rary code
for u
s
e
r
-rel
a
tive p
a
ths, ta
k
e three
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Joh
a
nnes
S
c
hinde
l
i
n
A
dd test
c
ase
for git-config-
s
et
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Johannes
Sc
h
indelin
Ad
d
documenta
t
i
o
n for git-con
f
i
g
-set
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Joha
n
n
es Schindelin
Add
gi
t
-config-se
t
, a simple helper for scr
i
p
ts to
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next