repo.or.cz
/
git
/
jnareb-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: conflicting rename case.
2005-12-05
Jun
i
o C Ha
m
ano
config
.
c:
remove unnecessary heade
r
in minimum
configurat
i
on
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Ha
m
ano
server-
i
nfo
.
c:
a
n
d
t
w
o
f
unctions
a
re
not
u
sed anymore
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
J
u
n
i
o C
H
a
mano
s
e
rver-info
.
c
:
use
p
ac
k
_local li
k
e e
v
erybody
e
lse
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
J
u
nio C Hamano
D
ocu
m
entation: shared repository manag
e
ment in tu
t
orial
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
Documentation: push/recei
v
e hook re
f
erences
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio
C
Ha
m
a
n
o
D
o
cumentation:
g
it-dif
f
asciidoc ta
b
le workaround
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
J
u
nio C Hamano
Docum
e
nt
a
tion: git-mv manpag
e
workaround
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hama
n
o
Doc
u
m
entation:
talk
a
b
o
u
t
pathspec in bisect
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Ha
m
ano
s
erver-info: throw aw
a
y T com
p
utatio
n
as well
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
J
u
nio
C Hama
n
o
server-inf
o
: stop sor
t
i
n
g pa
c
ks
b
y latest date
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
ser
v
er-i
n
f
o
.
c: d
r
op un
u
sed D lines
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
sha1_file
.
c
:
make sure p
a
cks in an a
l
ternate
o
d
b
i
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
J
unio C H
a
m
a
no
gi
t
.
c: remov
e
excess
o
utput for d
e
b
ugging when command
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Ham
a
no
struct tree: remove unu
s
ed
field "parent"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Jun
i
o
C
Ha
m
ano
Document
a
tion: rebase d
o
es not use
cherr
y
-pick anymore
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
J
u
n
i
o C Hamano
show-branch: allow gl
o
b pattern
t
o
nam
e
branches to
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-04
Jun
i
o C Hamano
git
.
c: two f
i
xe
s
,
g
itsetenv type and off
-
by-one error
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-04
J
u
n
io C Hamano
compat/seten
v
: do not free what we fed
puten
v
(3)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-04
Juni
o
C
Hamano
GI
T
0
.
99
.
9
l aka
1
.
0rc4
commit
|
commitdiff
|
tree
2005-12-04
Ju
n
io C Hamano
[PA
T
CH] dae
m
on
.
c and
path
.
e
n
t
e
r_repo(): revamp path
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Juni
o
C
H
a
mano
documentat
i
o
n
: git-bise
c
t (help HTML break man)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
git
-
m
erge doc
u
men
t
ation: co
n
flicting
m
er
g
e leaves hi
g
h
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Ju
n
io
C Hamano
me
r
ge-one-file: make sure
we do not mismerge symbolic
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
merge-one-file: make sure
we
c
reate the merged
f
ile
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Jun
i
o C H
a
mano
t3100: add ls-tr
e
e -t and -d tes
t
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio
C
H
am
a
n
o
merge-rec
u
rsive: adjust git-ls-tree use for the latest
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
git-merge-o
n
e-file: do not worry about 'rm
d
ir -p
'
not
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Juni
o
C
H
amano
ls-tree: --name-only
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Junio
C Hamano
ls-tree: resur
r
ect
'
-d' to me
a
n '
s
h
ow trees
only'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Hamano
Makefi
l
e: say t
h
e defaul
t
targ
e
t upfron
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Hamano
Docum
e
ntati
o
n:
d
es
c
ribe '-f
'
o
p
t
i
on to g
i
t-fetch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio
C Hamano
Merge
b
ranch
'
j
c/
s
ubdir'
commit
|
commitdiff
|
tree
2005-11-30
Ju
n
io C Hamano
Merge branches 'jc/apply', 'lt/ls-tree',
'
lt/bise
c
t
.
.
.
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
Tutor
i
al: adjust merg
e
e
xample
t
o recursive s
t
rategy
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C H
a
mano
merge-re
c
ursive: match the unmerge
d
inde
x
e
ntry be
h
a
v
iour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C H
a
mano
diff-files: show diffs wi
t
h
stage
0
and
unmer
g
e
d s
t
ag
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
J
un
i
o C Hamano
git
-
diff: do not tur
n
off
-p/-M wi
t
h
any diff options
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C H
a
mano
Me
r
ge http://www
.
k
e
rnel
.
org/
p
ub
/
scm/gi
t
k/g
i
tk
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C Haman
o
f
o
rmat-patch
:
ru
n
diff in C locale
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Hamano
format-patch: do not
abuse 3
-
dash
marker lin
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio
C
Hamano
format-patch: r
e
mov
e
a
p
p
l
ies-to
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C
H
amano
ap
p
lyp
a
tch: use
"index" lines n
o
t "
a
p
p
l
i
e
s-to"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C Ha
m
a
no
ap
p
lymbox: typofi
x
t
o enab
l
e -m option
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C H
a
mano
hash-o
b
ject
.
c: type-fix
to squelch compiler warnings
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C Hamano
de
f
ine
die()
for scripts that
use i
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C Hamano
verify-tag: make it op
e
r
able from a s
u
bdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
a
mano
tag:
make
i
t o
p
erab
l
e fro
m
a s
u
bdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C Hamano
l
o
st-found: make it oper
a
ble
f
r
om a
subdi
r
ectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C
H
amano
branch: m
a
ke it operable from a subdi
r
ectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C
H
amano
ls-remote: d
e
fine
die() now we d
o
not use git-sh-
s
etu
p
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ham
a
no
count-objec
t
s: make it operable fro
m
a subdire
c
tor
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
un
i
o C
Hamano
Make the
rest of
commands work from a subdir
e
ctory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
M
ake network
i
n
g commands to w
o
rk from a subdi
r
ectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
ls-tr
e
e: work fro
m
subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Hamano
hash-object:
w
ork w
i
th
i
n
subd
i
rectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C
H
amano
checkout-index:
work
f
rom subdire
c
tor
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C Hamano
fsck-objec
t
s: work from subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Haman
o
pee
k
-
remote:
ho
n
or proxy config e
v
en from subdirector
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ham
a
no
git-apply
:
work from subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
w
orking fro
m
subdirectory:
p
reparation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C
H
amano
bisect: quote pathnames fo
r
eval safety
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C Haman
o
ls-t
r
ee: match the
t
est to th
e
n
ew sem
a
ntics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
ls-
t
ree: Resurrect funn
y
name
q
uoti
n
g
l
os
t
du
r
ing rewrite
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
write_name_quot
e
d():
m
ake one of the path a counte
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
am
a
no
Documentation: Describe merge op
e
ra
t
ion a bi
t
better
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
name-rev: fix par
e
n
t counting
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio
C
Hamano
rebase:
one
s
afety
net
,
one
b
ugfix and one opti
m
ization
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Ham
a
no
Me
r
ge htt
p
://www
.
ke
r
n
el
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-28
Ju
n
io C Hamano
git-mv: q
u
ote $src in
r
egexp prope
r
ly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
J
u
nio C
H
am
a
no
[PATCH]
g
itk: Use
i18n
.
commitencod
i
ng con
f
iguration
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Ham
a
no
config
.
c: c
o
nstn
e
ss tightening to avo
i
d compilation
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Juni
o
C Hamano
mail
i
nfo: Do n
o
t use
-
u=<e
n
coding>;
say --encoding
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
mail
i
nfo: Use
i18n
.
commitenco
d
ing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Ha
m
a
no
mailinf
o
: allow -u to fall back on
latin
1
t
o utf
8
c
onversion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
Intro
d
uce i1
8
n
.
commitencodi
n
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
Merge http://www
.
kernel
.
o
rg
/
pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
setu
p
_
g
i
t_director
y
(): check repository form
a
t version
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
init-
d
b: check temp
l
ate and reposit
o
ry format
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Ju
n
io C H
a
m
ano
Che
c
k
repo
s
itory fo
r
mat version in enter_repo(
)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Jun
i
o
C
Haman
o
Reposit
o
ry format ve
r
si
o
n check
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Haman
o
format-patch:
o
utput fil
e
name repor
t
ed
t
o
s
t
d
out verb
a
t
i
m
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Hamano
n
ame-r
e
v: fix of
f
-by-one error in --stdin
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
J
u
nio C
Hama
n
o
shell
.
c
: complain on insufficient a
r
gum
e
nts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
J
uni
o
C
Hamano
GIT 0
.
99
.
9
k
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
git-sh-setup: move th
e
repo
s
ito
r
y che
c
k to a c
o
re program
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C H
a
mano
s
etup_git
_
direct
o
ry: mak
e
sur
e
G
I
T
_DIR is a
v
alid reposit
o
ry
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Ha
m
ano
git-va
r
:
m
a
ke it wo
r
k in subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
J
unio
C
Hamano
git-sh-s
e
t
u
p
:
die if outside git r
e
posit
o
ry
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Ju
n
i
o C Hamano
p
a
rse
-
r
e
mote and
ls-remote clean-up
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
Preven
t
"git-
c
ommit -a path1 p
a
th2
.
.
.
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio
C
Hamano
co
n
fig
.
c
:
a
void shado
w
ing glob
a
l
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Ju
n
io C Hamano
di
f
f
-tre
e
:
t
e
ac
h
singl
e
-commit dif
f
-tree to
honour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Junio C
H
amano
T
each update-ind
e
x to r
e
ad from ls-tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
J
u
nio C Hamano
git-rever
t
: make --edit d
e
fa
u
lt
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Junio C Ha
m
ano
git
-
merg
e
:
m
a
k
e recu
r
sive the default strategy
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Junio C H
a
m
ano
p
a
c
k
-re
d
undant:
t
ype
c
leanups
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
Junio C Hamano
M
erge http:
/
/www
.
k
e
rnel
.
org
/
p
ub/scm/gitk/g
i
t
k
commit
|
commitdiff
|
tree
2005-11-22
J
u
n
io C Ha
m
ano
git-var: constness and globalness cleanu
p
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
J
u
nio C Hamano
Mov
e
di
f
f
.
ren
a
m
elimit ou
t
of default configuration
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Junio C Hamano
git-pr
o
x
y updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next