repo.or.cz
/
git
/
trast.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-one-file: leave unmerged index entries upon automerge failure.
2005-11-30
Linus Torv
a
lds
merge-one-f
i
le: le
a
ve un
m
erged in
d
e
x
en
t
ries upon automerge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
L
i
nus
Torvald
s
diff-files: -1/
-
2/-3 to diff against unmerged stage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
J
u
nio
C
Hamano
g
i
t
-
dif
f
: do not t
u
rn o
f
f -p/-M wit
h
any diff op
t
ions
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
n
io C Hamano
Merge http://ww
w
.
kernel
.
o
r
g/pub/sc
m
/
git
k
/gitk
commit
|
commitdiff
|
tree
2005-11-29
A
l
ex R
i
esen
[
PA
T
CH]
A
d
d
t
ests for git-mv in subdir
e
ctor
i
es
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
Joha
n
nes Schindelin
[PAT
C
H] Make git-mv work
in subdir
e
c
tories
,
too
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
M
atthias U
r
lich
s
SVN
i
m
p
ort: Use on
e
log call
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
jdl
@
freescale
.
com
Fix typos a
n
d
minor fo
r
mat issues
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Nick He
n
gevel
d
http-push cleanup
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Pavel Rosk
i
n
git
-
clone --sha
r
e
d should imply --local
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
write_name
_
quoted(): make one of the
p
a
th a counted
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
Documenta
t
ion: Des
c
ribe merge op
e
ration
a bit b
e
t
ter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Jan An
d
r
e
s
F
i
x ty
p
o in http-p
u
sh
.
c
commit
|
commitdiff
|
tree
2005-11-29
Junio C Haman
o
name-re
v
: fix parent count
i
ng
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio
C Hamano
reb
a
s
e:
o
ne safety ne
t
, one bugfix and one opt
i
mization
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hama
n
o
Merge
h
tt
p
://www
.
kernel
.
org/p
u
b/sc
m
/git
k
/gitk
commit
|
commitdiff
|
tree
2005-11-28
Junio
C
H
amano
git-mv: quote
$
src in regexp
p
roperly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Juni
o
C
Hamano
config
.
c: const
n
ess tig
h
te
n
ing to avoid compil
a
tion
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C
H
amano
mailinfo: D
o
not use -u=<encoding>; say --en
c
oding
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
mail
i
nf
o
: Use i18n
.
c
ommitencoding
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Ha
m
ano
mailinf
o
: allow -u to fa
l
l back on latin1 to utf
8
conversion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
J
unio C
H
a
m
a
n
o
I
n
t
rodu
c
e i18n
.
co
m
m
ite
n
c
o
di
n
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Y
a
nn Dirson
Fix gitk this->selected
d
i
ffs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Ham
a
no
Merge ht
t
p://www
.
kernel
.
org/pub/scm/
g
i
t
k/gitk
commit
|
commitdiff
|
tree
2005-11-27
J
ose
f
Weid
e
ndorfer
git-mv: follow -k
r
equest even on failing rename
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Josef Weidendorfer
S
mall
fixes in Documentation/git-mv
.
txt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Josef
Weide
n
dorfer
git-
m
v:
f
ull
y
detect
'
directory
m
ov
e
d
into itself'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Josef Wei
d
e
n
dorfe
r
git-mv: keep git
index con
s
istent
w
i
th file system
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Josef Weide
n
dorfe
r
git-mv: shrin
k
usag
e
,
no usa
g
e on error
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Jun
i
o C Hamano
set
u
p_g
i
t_directory(): check repos
i
tory
fo
r
m
a
t version
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Ha
m
ano
init-db: ch
e
ck tem
p
lat
e
and repositor
y
format
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Haman
o
Chec
k
repository format versi
o
n in ente
r
_repo()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
R
e
p
ository format version che
c
k
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
J
u
n
i
o
C H
a
mano
forma
t
-patch: output filen
a
me r
e
ported to stdou
t
verbati
m
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Hamano
name-r
e
v:
f
ix
o
ff-by-o
n
e er
r
or in --stdin
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Alexander Li
t
v
inov
gi
t
-mv is
n
ot able to handle
big directories
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Hamano
shell
.
c
: complain on
i
nsuffic
i
e
n
t a
r
gumen
t
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
git
-
sh-s
e
tup: move
t
he rep
o
s
i
t
o
ry check to a core pr
o
gram
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
se
t
u
p_git_directory: make sure GIT_DIR is a
v
alid repository
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
git-
v
ar: ma
k
e
i
t
work in s
u
bdirector
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
g
it-sh-setup: die
if outside gi
t
r
e
pos
i
tory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C H
a
mano
pars
e
-
remote and ls-remote clean-up
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Ju
n
i
o C
H
amano
Prevent
"
git-c
o
mmit
-
a path1 path
2
.
.
.
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Ham
a
no
c
o
nfig
.
c
: av
o
id
s
hadowin
g
glob
a
l
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Y
OSHI
F
UJI
H
ideaki
.
.
.
Fi
x
a w
a
rnin
g
about unus
e
d
v
a
l
u
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
An
d
reas Eri
c
sson
cv
s
import: Do
n
't let
local settin
g
s hind
e
r cvs us
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Joha
n
nes Schindeli
n
Rename git-config-se
t
to
g
it-repo-co
n
fig
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
J
u
ni
o
C
Ham
a
no
diff-tre
e
: tea
c
h s
i
ngl
e
-commit
d
iff-tree
to
honour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Junio C Hamano
Teach update-ind
e
x
to read from ls-tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
J
u
nio C
Hamano
git-rev
e
r
t
: make --edit default
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Linus Torva
l
ds
A
l
low
editing of a r
e
vert-message
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Jos
e
f Wei
d
e
n
d
or
f
er
Fix git-mv fo
r
moving directories with 1 f
i
le
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Jun
i
o C Ha
m
ano
gi
t
-
m
erge: make recursive the default strategy
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Ju
n
io C Hamano
pack-redun
d
a
nt: type cleanups
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
Paul Ser
i
ce
F
ixe
d
g
it:// I
P
v4 address prob
l
e
m
when compiled
with
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
Al
e
x Riese
n
a
r
guments cleanup
a
nd some format
t
i
ng
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
Alex Riesen
rem
o
ve unused var
i
able
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
Alex Riesen
speed
u
p allocat
i
on in
p
ack-redun
d
ant
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
Lu
k
as Sandström
Make git-pack-redundant take
a
list of unimp
o
rtant
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
Junio C H
a
man
o
Me
r
ge http://www
.
kernel
.
org
/
pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-22
J
un
i
o C Hamano
git-var:
c
onstn
e
ss
a
nd globalnes
s
cl
e
anup
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
Junio C Hamano
M
ove diff
.
renamelimi
t
out
o
f
d
e
fault configur
a
t
ion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
Luben Tu
i
kov
max-count in term
s
of intersection
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
YOSHIFUJI Hideaki
.
.
.
GIT: Fix
c
o
mpilati
o
n
e
rror in connect
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
An
d
reas Ericsson
Introdu
c
e $(ALL_P
R
O
GRAMS
)
f
or
'a
l
l:' and 'in
s
ta
l
l
:
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
H
.
Peter Anv
i
n
rename/copy s
c
ore
p
arsing u
p
dates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Paul Serice
git-da
e
mo
n
not lis
t
e
n
i
ng w
h
en compiled
wi
t
h
-DNO_I
P
V6
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Lin
u
s Torvalds
git-rep
a
c
k:
P
roperly
abort in corrupt reposito
r
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Johannes S
c
hindelin
A
l
low hierarchi
c
al s
e
c
tion names
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Johannes
Schindelin
git-config-set: Properly terminate strings wi
t
h
'
\0'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Junio C Haman
o
git-proxy
u
pda
t
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
P
aul Collins
proxy-command supp
o
rt
f
or git://
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Jun
i
o C Hamano
daemon: further tweaks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Andre
a
s
Er
i
csson
g
it-daemon support for user-rela
t
ive paths
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Jun
i
o C Ham
a
no
tutorial: s
e
tting up a tree
f
o
r sub
s
yst
e
m
maintainers
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
J
unio C Ha
m
a
n
o
rename detection with -
M
100 mean
s
"e
x
act
r
en
a
m
e
s only"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Junio
C
H
amano
forma
t
-patch:
f
ix two
-
arg
u
m
e
nt sp
e
cial case
,
an
d
make
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
J
u
nio C Hamano
Fix hooks/u
p
date temp
l
ate
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Junio C Hamano
Mak
e
su
r
e heads/foo an
d
tags/foo do not confuse th
i
n
gs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Junio C Ham
a
no
F
i
x "d
o
not DWIM
"
patc
h
to enter_repo"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Andreas Eri
c
sson
git
-
rese
t
.
txt:
S
m
a
ll
f
i
x +
c
l
a
rifi
c
atio
n
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Ryan An
d
erson
A
d
d Pyth
o
n ver
s
i
o
n che
c
ks
t
o the Makefile to
au
t
o
m
atically
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
T
i
m
o Hi
r
von
e
n
Fix sp
a
rse warnings
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Jun
i
o
C Hamano
M
e
rge
h
ttp://
w
ww
.
ke
r
nel
.
org/pub/scm/git
k
/gitk
commit
|
commitdiff
|
tree
2005-11-20
Johann
e
s Sc
h
indel
i
n
git-config-set: support selecting va
l
ues by non-
m
atching
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Fr
e
drik Kuivine
n
merge-recursive
:
Replace 'except
:
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Ju
n
io C Haman
o
m
e
rge-one-fi
l
e:
use rmdir -p
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Ju
n
i
o C Hamano
Documentation: add hooks/
u
pdate
example
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Jo
h
annes Sc
h
indelin
git-config-set: add more options
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
And
r
eas
E
ricsson
Documentation upd
a
te
for user-relative pat
h
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Andre
a
s
Eric
s
son
Client si
d
e su
p
port for use
r
-relative pat
h
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Andreas
E
ricsson
Server-si
d
e suppor
t
for us
e
r-relative paths
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Junio
C
Hamano
Do no
t
DW
I
M
in
u
serp
a
th libra
r
y
under strict
mode
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
An
d
reas Ericsson
Library
c
ode
for user-
r
ela
t
i
v
e p
a
ths, take
thr
e
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Johannes Schindelin
Add test
c
ase fo
r
g
it-co
n
fig-set
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Johannes
Schindelin
Add
documenta
t
ion for git-config-set
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Johanne
s
Schindelin
Add git-
c
o
nfig-set, a simple
h
elper for scripts to
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
J
o
hannes Schinde
l
in
Add funct
i
ons git_config_set() an
d
git_
c
o
n
fig_set_multiva
r
(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
N
i
c
k Hen
g
e
v
eld
Decide whe
t
her to build
http-push
in the M
a
kefile
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Junio
C
Hama
n
o
http
.
c: reorder to avo
i
d compilation
failure
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next