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
J
u
nio C H
a
mano
me
r
ge-recursive:
match the unmerged
index entry
behav
i
our
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio C
Hamano
d
iff-files:
s
how
diffs wit
h
stage0 and unmerged st
a
ge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Linus Tor
v
alds
m
erge-on
e
-fi
l
e
: leave unmerged i
n
d
e
x e
n
tries upon a
u
tomerge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Linus Torval
d
s
diff-f
i
les: -1/-2/-3 to
d
iff against
unm
e
rged stag
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio C H
a
mano
git-diff: do
n
ot tur
n
of
f
-p
/
-
M with
a
ny diff
op
t
ions
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
H
a
m
a
n
o
Merge http://
w
ww
.
kernel
.
org/
p
ub/scm/
g
itk/g
i
tk
commit
|
commitdiff
|
tree
2005-11-29
Alex Riesen
[
P
ATC
H
]
Add tes
t
s fo
r
git-mv in subd
i
r
e
c
t
ories
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Johann
e
s Schindelin
[PATCH
]
Make git-mv wor
k
in subdirectories, too
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Matthias
U
r
lichs
SV
N
impo
r
t
:
U
se on
e
log ca
l
l
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
jdl@freescale
.
c
o
m
Fix typos and m
i
nor format
i
s
s
ues
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Nick Hengeveld
h
t
tp-push
clean
u
p
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Pavel Roskin
git-c
l
one
--sha
r
ed
should
im
p
ly
-
-loc
a
l
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
w
rite
_
name_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
Hamano
Documentation: D
e
s
c
ribe merge op
e
ration
a
bit be
t
t
e
r
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ja
n
Andr
e
s
Fi
x
typo
in http-push
.
c
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C Hamano
nam
e
-rev: f
i
x p
a
r
en
t
counti
n
g
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C H
a
mano
reba
s
e
:
one
s
afet
y
net, one
bugfix and one optimizat
i
on
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
J
unio C Hamano
Merg
e
h
tt
p
://www
.
kernel
.
org/pub
/
scm/git
k
/gitk
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
git-mv: qu
o
te $
s
rc in regexp prop
e
rly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
J
u
nio C Hama
n
o
config
.
c: constness tigh
t
ening
to avoid compilation
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio
C
Hamano
m
a
ilinfo:
D
o not use -u=<encoding>; say --e
n
coding
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio
C Hamano
mailinfo: Use i18n
.
co
m
mite
n
coding
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
m
a
ilinfo
:
allow -u t
o
fa
l
l back on latin
1
to utf8 conversion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C H
a
mano
Introduce i18n
.
commitenco
d
ing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Yann
Dirson
Fix git
k
t
h
is->selected diffs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio C H
a
mano
M
e
rge
h
ttp://ww
w
.
ker
n
el
.
org/pub/scm/
g
itk/gitk
commit
|
commitdiff
|
tree
2005-11-27
Jos
e
f
We
i
dendorfe
r
git-mv: fo
l
low -k req
u
es
t
e
ven on f
a
il
i
ng rena
m
es
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Josef Weidendorfe
r
Sm
a
ll fi
x
es in Documentation/git-mv
.
txt
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Josef We
i
dendorfer
git-
m
v:
f
ul
l
y
detect
'
direct
o
ry moved
i
n
to itself'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Josef Weiden
d
orfer
git
-
mv: keep git index consistent with file
s
y
stem
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
J
osef We
i
dendorfer
git-mv:
s
hri
n
k usage, no usa
g
e on
e
rror
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Juni
o
C Hamano
setup_
g
it
_
directo
r
y(): ch
e
ck repo
s
itory format version
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hama
n
o
i
nit-db
:
che
c
k template and repository format
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio
C
H
a
man
o
Check repository format version in enter_repo()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
J
u
nio
C Hamano
Repository
f
ormat
v
ersion chec
k
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Ha
m
ano
format-p
a
tch: outpu
t
filename report
e
d to stdout
v
er
b
a
tim
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Haman
o
name-rev
:
fix of
f
-by
-
o
n
e error in --stdi
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
A
l
e
x
ander Litv
i
nov
git-m
v
i
s not able to ha
n
dle big di
r
e
c
t
ories
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
J
unio C Hamano
shell
.
c: complain on insufficient arguments
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio
C
Ha
m
ano
git-s
h
-setu
p
:
m
ove the repository ch
e
c
k to
a co
r
e program
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Juni
o
C
Hamano
se
t
up_git_di
r
ectory:
m
a
k
e
s
ure GIT_DIR is a valid
r
eposit
o
ry
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
J
u
nio
C
Hamano
gi
t
-var: make it
w
o
r
k
i
n subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C H
a
m
ano
git-sh-setup: die if outside git repos
i
tory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
J
u
n
i
o C Hama
n
o
parse-remote and ls
-
rem
o
te clean-up
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
J
u
nio C Hamano
Prevent
"
git-c
o
mm
i
t -a path
1
p
a
th2
.
.
.
"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hama
n
o
co
n
fig
.
c: avoid s
h
a
dowing global
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
YOSHIF
U
JI Hidea
k
i
.
.
.
Fix a warning about unused value
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Andre
a
s
Er
i
csson
cvsimport
:
Do
n
't let local settings hinder cvs use
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
Johannes Schindelin
Ren
a
me git-config
-
s
et to gi
t
-rep
o
-con
f
ig
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
Junio C H
a
m
a
no
di
f
f-tree
:
teach single-commit diff-tree to honour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
Junio C Hamano
Teach
u
pdate-index to read from ls-tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
Junio C
Ha
m
a
no
git-re
v
ert
:
make
--edit def
a
ul
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
L
i
n
us Torvalds
Allow e
d
iting of a reve
r
t-m
e
s
s
age
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
Jose
f
W
e
idendorfer
Fix
git-mv for movin
g
direct
o
ries w
i
th 1 file
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
J
u
n
i
o
C Ham
a
no
git-
m
e
rge: m
a
ke recursive t
h
e defaul
t
s
t
rateg
y
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
J
unio
C
Hamano
pac
k
-
r
ed
u
ndant: type cleanu
p
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-22
Paul Seric
e
Fi
x
ed git:// IPv
4
a
d
dress
p
roblem w
h
en c
o
mpile
d
with
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-22
Alex Riesen
a
r
guments clean
u
p
and
s
ome formatting
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-22
Alex Riesen
remove unused
variable
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-22
Ale
x
Riesen
speedu
p
allocati
o
n in pack-r
e
dundant
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-22
Lukas Sands
t
röm
Make
git
-
pack-redundant
take a list o
f
unimportant
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-22
J
unio C
H
a
m
ano
Merg
e
http://www
.
kernel
.
org/
p
ub/
s
cm/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-22
Junio C Hamano
gi
t
-var: constness and globa
l
ness cl
e
a
n
up
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-22
Juni
o
C Hamano
Move dif
f
.
re
n
amelimit out of d
e
fault configuration
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-22
L
u
be
n
Tuikov
max-
c
ount in terms of intersectio
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-22
YOSHIFUJI Hid
e
aki
.
.
.
GIT: Fix
c
ompilation error in
conn
e
c
t
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-22
Andr
e
as Er
i
c
sson
I
n
t
roduce $(ALL_PROGRAMS) f
o
r
'all:
'
and 'install:
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
H
.
Peter
Anvin
rename/c
o
py score p
a
rsi
n
g upd
a
tes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Paul Serice
git-daemon
n
ot
list
e
n
i
n
g
when compiled
w
ith -DNO_IPV6
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Lin
u
s
T
or
v
alds
git-repack: P
r
operly abort
in
co
r
ru
p
t r
e
po
s
itor
y
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
J
oh
a
n
nes Schinde
l
in
Allow hierarchical section names
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Johannes Schi
n
del
i
n
git-
c
onfig-set
:
Properly term
i
nate str
i
ngs with '\0'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Junio C Hama
n
o
git-
p
roxy updates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Paul Co
l
lins
proxy
-
com
m
and supp
o
rt
f
or gi
t
:
//
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Junio C Ham
a
no
daem
o
n: furt
h
e
r
t
w
eaks
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
And
r
eas
Ericsso
n
git-da
e
mon suppor
t
for use
r
-r
e
l
a
tive paths
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Junio C Ha
m
ano
tu
t
orial:
s
ett
i
ng up a tr
e
e
for su
b
s
yste
m
m
a
inta
i
ners
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
J
u
n
i
o C Ham
a
n
o
rename detectio
n
with -M100 means "exact renames only"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
J
u
nio C Hamano
format-patch: fix
t
wo-argu
m
e
n
t spe
c
ial case, and make
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
J
u
nio C
H
amano
Fix hook
s
/update t
e
mplate
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Junio C Hamano
M
ak
e
sure heads/foo and ta
g
s
/
foo do
not confus
e
things
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Ju
n
io C
H
amano
Fix "do not DWIM"
p
atch t
o
ent
e
r_re
p
o"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Andreas
Ericsson
git-
r
eset
.
txt: Small fix + cl
a
rific
a
tion
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Rya
n
A
n
d
erson
A
d
d Python version checks to the Makefile to automat
i
c
ally
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Timo Hirvon
e
n
Fix sp
a
rse
w
a
rnings
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
Juni
o
C H
a
mano
Merge ht
t
p
://www
.
ke
r
nel
.
org/
p
ub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-20
Johannes Schindel
i
n
g
it
-
co
n
fig-set:
s
upport selec
t
ing va
l
ues by
non-matching
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
Fredrik Ku
i
vin
e
n
merge-recur
s
ive: Replace
'e
x
cep
t
:'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
Junio
C Hamano
m
erge-one-file: use rmdi
r
-
p
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
Junio C Haman
o
Documentation: add hooks/update example
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
Johann
e
s
Schind
e
lin
git-conf
i
g-se
t
:
add
m
o
r
e options
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
And
r
eas E
r
i
csson
Docume
n
tation update for user-relative paths
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
Andreas Ericsson
Clien
t
side
support
f
or user-relative paths
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
Andreas
E
r
ic
s
son
Server-side
s
upport for user-relative paths
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
J
uni
o
C Hamano
Do n
o
t DWIM in user
p
ath libr
a
ry under s
t
rict mode
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
Andrea
s
Eric
s
son
Library c
o
de for use
r
-relative pat
h
s, t
a
k
e three
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
Johannes
Schindelin
A
dd te
s
t
case for git-config-set
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
Jo
h
annes Schindel
i
n
Add docu
m
enta
t
ion
for
git-config-set
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
Johannes Schind
e
lin
Add git-config-set,
a simple helper for scr
i
pts
to
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
J
o
hannes Sc
h
i
n
de
l
in
A
d
d fun
c
tions
g
it_config_set() and git_config_set_m
u
ltivar()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next