repo.or.cz
/
alt-git.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
Junio C Ha
m
ano
merg
e
-recurs
i
ve:
matc
h
the
u
nme
r
g
e
d index en
t
r
y
b
eh
a
v
iour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C H
a
mano
d
i
ff-files:
s
h
ow di
f
fs with stage0 an
d
unmerged sta
g
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Linus Torvalds
merge-one-file: leave unmerged index entri
e
s u
p
o
n
automerge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Linus Torval
d
s
diff-fi
l
es
:
-
1/-2/-3 to d
i
ff against unmerged st
a
g
e
.
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 options
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Hamano
Merge h
t
tp:/
/
www
.
ke
r
nel
.
org/pub/scm/gitk
/
gi
t
k
commit
|
commitdiff
|
tree
2005-11-29
Alex Rie
s
en
[PATCH] Add tests for g
i
t-mv in subdirectories
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
Johann
e
s S
c
hinde
l
in
[PAT
C
H] Make g
i
t-mv w
o
rk in s
u
b
director
i
e
s
, too
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Matthi
a
s U
r
lichs
SVN imp
o
rt: Use one log ca
l
l
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
jd
l
@f
r
eesc
a
le
.
com
Fix typos and
m
inor
f
or
m
at iss
u
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
N
ick Hengeveld
h
t
tp-push
cl
e
anup
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Pav
e
l R
o
skin
git-clone
--shared should
i
mply --local
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Haman
o
w
rit
e
_name_quot
e
d(): make one o
f
the path a counted
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Ha
m
an
o
Docu
m
entation: Describe
merg
e
o
p
eration a b
i
t
b
etter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Jan Andres
Fi
x
typo in http-push
.
c
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Ha
m
ano
n
ame-r
e
v: f
i
x pa
r
en
t
counting
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio
C
Ham
a
no
rebase
:
one safety
n
e
t, one bugfix and on
e
o
ptimiz
a
tion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Haman
o
Merge http://www
.
kernel
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
git-
m
v:
quote $src in
r
egexp properly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Juni
o
C
Hamano
conf
i
g
.
c:
c
onstne
s
s
tight
e
ning to avoid compilatio
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
mai
l
info: Do n
o
t use -u=<encoding>;
s
ay --encodi
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
J
u
n
i
o
C Haman
o
mailinfo: Us
e
i18n
.
commitencoding
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio
C Ham
a
n
o
maili
n
fo: allow
-
u to f
a
ll back on latin1 to ut
f
8 conver
s
ion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
J
u
nio C
Hamano
I
n
tro
d
uce i18n
.
c
o
mmi
t
encoding
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Yann Dirs
o
n
Fix gitk this-
>
selected diffs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
Me
r
g
e http:
/
/www
.
ker
n
el
.
org/pub/
s
cm/gitk/
g
itk
commit
|
commitdiff
|
tree
2005-11-27
Jos
e
f Weide
n
do
r
f
er
gi
t
-mv: f
o
llow -k request even
o
n failing renames
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Josef Weidendorfer
Small
f
ixes in
D
o
cu
m
entation/git-mv
.
tx
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Josef Weidendorfer
git-
m
v
:
f
ul
l
y
detect 'director
y
moved in
t
o
itself'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
J
o
se
f
Weidendo
r
fer
git-mv: keep git inde
x
consis
t
ent with file system
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
J
osef Weide
n
dorfer
git-mv: shrink usage
,
no usage
o
n
er
r
or
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Ha
m
a
n
o
setup_git_director
y
(
)
:
check repo
s
itor
y
format ver
s
ion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio
C Ham
a
no
init-d
b
: check template a
n
d re
p
o
s
i
t
ory format
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
Check repository 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
Haman
o
Reposi
t
ory form
a
t version
c
heck
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Hama
n
o
format-patch: outp
u
t filename reported
t
o stdout
verbatim
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Juni
o
C
H
a
ma
n
o
name-
r
e
v
: fix o
f
f-by-one error in --
s
td
i
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Alexander Litvin
o
v
git-mv is not able t
o
handle bi
g
directo
r
ies
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Hamano
she
l
l
.
c: complain
o
n insufficie
n
t arguments
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio
C
Hamano
git-s
h
-setup: move the re
p
o
s
i
t
ory
c
heck to a
c
ore program
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
setup_git_d
i
rec
t
ory: make sure GIT_DIR is a
valid rep
o
sitory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
git-var
:
ma
k
e it
w
ork in subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Ju
n
io C
H
a
ma
n
o
git-sh-
s
e
tup: die if o
u
tside g
i
t repo
s
ito
r
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio
C
Hamano
parse-re
m
ote a
n
d ls-remote
c
lea
n
-
u
p
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
J
u
n
io
C
Ham
a
no
P
r
e
v
ent
"
gi
t
-
c
ommit -a p
a
th1
path2
.
.
.
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Ju
n
io
C
Hamano
co
n
fig
.
c:
avoid shadowing
g
lobal
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Y
O
S
HIFUJI Hid
e
aki
.
.
.
Fix a warning a
b
out unused valu
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
An
d
reas Eri
c
sson
cvsi
m
po
r
t: Don't let loca
l
settings h
i
nder cvs user
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Joh
a
nnes Schindelin
Re
n
ame git-co
n
fig-set to git-repo-c
o
nfig
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Junio
C
Hamano
d
i
ff
-
tree: te
a
ch single-commit diff-tree to honour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
J
u
ni
o
C H
a
man
o
Tea
c
h
update-ind
e
x to
r
ea
d
from ls-tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
J
unio C Hamano
git-revert: make
-
-edit de
f
ault
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
L
i
n
us Torval
d
s
Allow editing
o
f a rev
e
r
t-message
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Josef Weidendorfer
Fix g
i
t-mv for moving directories with 1 file
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Junio
C
H
ama
n
o
git-m
e
rge: make recursi
v
e th
e
d
e
fau
l
t
str
a
tegy
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Juni
o
C
Ha
m
ano
p
ac
k
-r
e
dundant
:
t
y
pe cleanups
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
Pau
l
S
e
r
i
ce
Fi
x
ed git:// IPv4 address prob
l
e
m whe
n
compi
l
ed with
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
A
l
ex Riesen
argumen
t
s
cleanup and some formatting
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
Al
e
x Riesen
remove unused va
r
i
able
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
Alex Riesen
speedup allocation in
p
ack-redundant
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
Lukas
San
d
ström
Make
git-pack-redundant take a list
o
f unimp
o
rtan
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
Junio C Hamano
Merge http://www
.
kernel
.
org/pub/scm/git
k
/gitk
commit
|
commitdiff
|
tree
2005-11-22
Ju
n
i
o
C Ham
a
no
git-var: cons
t
ness a
n
d
g
lobaln
e
ss cleanup
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
Junio
C Ha
m
ano
Move diff
.
renamel
i
mit
ou
t
of defaul
t
configuration
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
L
ube
n
Tuikov
max-
c
ount in
terms of intersection
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
Y
OS
H
I
F
UJI
H
ideaki
.
.
.
GIT: Fix compilation
error
i
n connect
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
Andre
a
s Eri
c
sson
Introduce $
(
A
LL_PROGRAMS
)
for
'
a
ll:
'
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
rs
i
ng updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Paul Serice
git-daemon not listeni
n
g when
c
o
m
piled
with -DNO_I
P
V6
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Linu
s
Torval
d
s
git-repack: Properly abort in co
r
rupt repos
i
t
o
ry
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Johanne
s
Schindeli
n
Allow hierarch
i
cal section names
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Johannes Schindelin
g
it-config-se
t
: P
r
operly terminate strings with '\
0
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Junio C Hamano
git-proxy updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Paul Co
l
lins
proxy-
c
ommand su
p
por
t
f
or git://
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
J
unio C
H
amano
daemon: fur
t
her tweaks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
A
ndreas Ericsson
git-daemon support fo
r
us
e
r-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 fo
r
subsys
t
em m
a
intainer
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Junio C Hamano
r
e
name detect
i
on with
-
M100 means "exact renames onl
y
"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Junio
C
Hamano
format-pat
c
h
:
fix two
-
argument s
p
ecial case,
and make
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Junio
C
Hamano
F
i
x hooks/upda
t
e template
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Jun
i
o C Hamano
Make
sure h
e
ads
/
f
oo
and t
a
gs/fo
o
do n
o
t c
o
n
fu
s
e
t
hings
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Junio C Ha
m
a
n
o
Fix "d
o
n
ot
DWIM"
p
atch to enter_repo"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Andreas Eri
c
sson
git-reset
.
txt: Small fix +
c
larifica
t
io
n
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
R
yan
A
nderson
Add
Python ve
r
s
ion check
s
t
o the M
a
kefile to automati
c
ally
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Timo
Hir
v
onen
Fix
s
parse war
n
in
g
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Junio C Hamano
Merge
http://www
.
ker
n
el
.
org/pub/scm/gitk/
g
itk
commit
|
commitdiff
|
tree
2005-11-20
Johannes Schinde
l
in
git-config-set:
support
s
e
l
e
c
ting values
b
y non
-
m
atching
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
F
redri
k
Kuiv
i
nen
mer
g
e
-
r
e
cursive:
R
eplace 'except:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Juni
o
C Hamano
mer
g
e-o
n
e-file: use rmdir -
p
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Junio
C Hamano
Documentation: add hooks/update ex
a
mple
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
J
o
hanne
s
Schin
d
el
i
n
g
it-config-set: add more opti
o
ns
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
And
r
e
a
s
Eri
c
sson
Doc
u
mentation update for user-relative
p
a
ths
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
An
d
reas E
r
icsso
n
Client sid
e
suppo
r
t for u
s
er-relative
p
at
h
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Andreas
E
r
icsson
S
erver-side support
for user
-
relative paths
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Juni
o
C Hama
n
o
Do not DWIM in userpath
l
ibrary under s
t
rict
m
ode
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Andre
a
s Ericsson
L
i
b
rary code
for user-relative
p
aths, take thre
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
J
ohanne
s
Schin
d
elin
Add te
s
t
case for git-config-set
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Johannes Schindelin
A
dd
d
ocum
e
ntati
o
n for git-config-
s
e
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Johannes Sc
h
indeli
n
Add g
i
t-config-set,
a simple helper for scripts to
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Johann
e
s Schi
n
delin
Add functions git_conf
i
g_set() and git_con
f
i
g
_set_multiva
r
()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next