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
git-merge documentation: conflicting merge leaves higher stages in index
2005-12-02
Jun
i
o C Hamano
g
i
t
-mer
g
e docume
n
tation: con
f
l
icting merge
l
e
aves hi
g
her
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
merge-on
e
-file: make sur
e
we do not mismerge symbolic
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Jun
i
o C Ham
a
n
o
merge-one-file: make sure
we c
r
eate the mer
g
ed fil
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio
C
Hamano
t31
0
0:
a
dd l
s
-tree -t and -d tes
t
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
merge-recursiv
e
: adjust
git-ls-tree
u
s
e
for the l
a
tes
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Ju
n
io C Hamano
git-merge-one-
f
i
l
e: do not worry about 'rmdir -p' not
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Ha
m
ano
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
e
c
t
'
-
d'
to mean 'show
t
rees on
l
y
'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Hamano
Makefile: say the default ta
r
get upfron
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Jun
i
o
C
H
amano
Documentation
:
de
s
c
r
ibe '-f' o
p
t
i
on to git-
f
etch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Ham
a
no
Merge branch 'jc/
s
ubdir'
commit
|
commitdiff
|
tree
2005-11-30
Junio C Ha
m
ano
Merge branches
'
j
c/apply', 'lt/ls-
t
ree', 'lt/bisect
.
.
.
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
Tutorial: adjust
m
erge example
to
r
ecursive st
r
ate
g
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio
C Ham
a
no
merge-recu
r
sive: match the
u
nmer
g
ed index entry beh
a
viour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Ju
n
io C Hama
n
o
diff-file
s
:
show di
f
fs with stage0 an
d
unm
e
rged stage
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio C H
a
mano
g
i
t-diff: do not turn off -
p
/
-
M wi
t
h any
diff option
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
unio
C Hamano
Mer
g
e
http:/
/
ww
w
.
k
e
r
nel
.
org/pub/sc
m
/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C H
a
mano
format-
p
atch:
r
un d
i
ff
in C local
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
f
orm
a
t-pa
t
ch: do not abuse 3
-
dash marker line
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Hamano
format-patch
:
remov
e
applie
s
-
t
o
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
applypatch: use "in
d
e
x"
line
s
not "a
p
plies-
t
o"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Hamano
applymbox:
t
ypofix to en
a
ble
-
m
o
ption
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hama
n
o
h
as
h
-o
b
ject
.
c:
t
y
pe-
f
i
x to
squelch co
m
piler
w
a
r
nings
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C Hamano
d
e
fine die() for scripts that use it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ha
m
ano
veri
f
y-tag: ma
k
e it operable
from a subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
t
ag: make it operable from a subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C
H
amano
lo
s
t-found: m
a
ke
it
oper
a
ble f
r
om a su
b
directory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C Hamano
branch
:
make
i
t operabl
e
from a subdire
c
t
ory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hama
n
o
ls-remote
:
d
efine di
e
() now we do n
o
t use git-s
h
-
setu
p
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Hamano
count-objects: make it op
e
rable from a
s
u
bdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Haman
o
Mak
e
the r
e
st of command
s
w
ork from
a
s
u
bdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C H
a
man
o
Make
net
w
or
k
ing
c
ommands to work from a
s
ubdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C Hamano
ls-
t
ree: work
f
rom s
u
b
d
irectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Hamano
h
a
sh-ob
j
ect: work within subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C Hamano
checkout-
i
nd
e
x: work from
s
u
bdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C
Hamano
f
s
ck-objects: wor
k
from subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
pee
k
-rem
o
te: honor p
r
oxy
c
o
n
fig even from
s
ubdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ham
a
n
o
g
i
t-apply: work from subdirec
t
o
r
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
working from subdirectory:
p
reparati
o
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
i
o C Ham
a
no
bisect: quote pathnames for
e
val s
a
fety
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C Hamano
ls-
t
r
ee: match the test
to the new semant
i
cs
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C H
a
mano
ls-tree
:
Res
u
rrect funny
nam
e
q
u
ot
i
n
g
l
ost during re
w
rite
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C Hamano
wri
t
e_name_quoted(): ma
k
e one of
t
he pat
h
a counted
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C Hamano
Documenta
t
i
on: De
s
cri
b
e
m
e
r
ge operation a bit bet
t
e
r
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
n
a
me
-
rev: fix pa
r
ent
c
ounting
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Ju
n
io
C
Hamano
rebase:
o
ne
s
afe
t
y
net, one bu
g
fix
and one optimization
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hama
n
o
M
e
rge http://ww
w
.
kernel
.
o
r
g/pub/scm
/
gitk/gitk
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
git-mv: quote $src
in
regexp properly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
[P
A
TCH]
gitk:
U
se
i18n
.
commitencoding configur
a
tion
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
config
.
c: constn
e
ss tightening to avoi
d
co
m
pilation
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C
H
amano
mailinf
o
: Do not
u
s
e
-u=<
e
n
c
odi
n
g>;
say --encoding
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
J
un
i
o
C Hamano
mailinfo: Use i18n
.
commiten
c
oding
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio
C Hamano
m
a
ili
n
fo: allow -u
t
o fall ba
c
k
o
n
l
atin1
t
o utf8 conversion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Juni
o
C H
a
mano
I
n
troduce i18n
.
c
o
mmiten
c
oding
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio
C
Hamano
Merge http://www
.
kernel
.
org/pub/scm/gi
t
k/gitk
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
setup_git_direc
t
or
y
()
:
ch
e
ck repository
format
v
e
rsion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
J
un
i
o C H
a
mano
init
-
db: check template and repos
i
tory for
m
at
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
C
heck repository format version i
n
e
n
t
er_repo()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Haman
o
Reposito
r
y format version chec
k
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
J
uni
o
C
H
amano
format-
p
atch:
o
utp
u
t filename re
p
orte
d
t
o stdout v
e
r
batim
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Junio C
Hamano
name-r
e
v: fix off-by-on
e
error in --stdin
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Junio C H
a
mano
shel
l
.
c: compla
i
n
o
n
i
nsufficient argumen
t
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
J
u
n
i
o C H
a
m
a
no
git-sh-setup: move
t
h
e
rep
o
s
i
to
r
y ch
e
ck to a core pro
g
ram
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Ha
m
ano
setup
_
git_d
i
recto
r
y
: make
s
ure GIT_DIR is a va
l
id
r
e
p
o
sito
r
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
J
u
nio C H
a
ma
n
o
git-var: make
it
w
ork in subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Juni
o
C Hamano
git
-
sh-s
e
tup: die i
f
outside git reposi
t
ory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
parse-rem
o
te and ls-remote clean-up
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hama
n
o
Pr
e
vent "git
-
commit -a path
1
path2
.
.
.
"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio
C
Hamano
c
o
nfig
.
c
:
avoid shadowing globa
l
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
Junio C Hamano
diff-t
r
ee
:
teach
s
ingle
-
co
m
mit diff-tree t
o
honour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
Junio C
H
am
a
no
Teach u
p
dat
e
-index t
o
r
e
ad fr
o
m
ls-tr
e
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
J
u
n
io C H
a
mano
g
i
t-reve
r
t: make --edit def
a
ult
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
Junio C Hamano
git-
m
erge: m
a
ke re
c
u
rs
i
ve the
def
a
ult strategy
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
J
u
n
i
o
C
Ham
a
no
pack-
r
edundant: type cl
e
an
u
ps
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-22
Junio C Hama
n
o
Me
r
ge htt
p
://w
w
w
.
kernel
.
org/pub/scm/g
i
tk/g
i
tk
commit
|
commitdiff
|
tree
2005-11-22
Junio C Hamano
git-var: con
s
tn
e
ss and
global
n
ess clea
n
up
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-22
Ju
n
i
o C Hamano
Move diff
.
renamel
i
mit out of defa
u
lt
c
onfig
u
ration
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Junio C Hama
n
o
git-proxy upda
t
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Jun
i
o
C Hamano
daemon: fur
t
he
r
tweaks
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Junio C Hamano
tutorial
:
s
e
tting up
a tre
e
for subsy
s
tem maint
a
iners
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Junio C
H
amano
r
e
nam
e
d
etection
with -M
1
00 means "exact renames onl
y
"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Junio C Hamano
format-patch: fix two-argument special ca
s
e
, and make
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Ju
n
io
C
Hamano
Fix
hooks/update t
e
mplat
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
J
u
nio C Hamano
M
a
k
e sure hea
d
s
/
foo and tags/foo do not co
n
fuse thi
n
gs
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Junio C H
a
mano
Fix "do not DWIM"
p
atch
to
enter_repo"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
J
uni
o
C
Hamano
Merg
e
htt
p
://www
.
k
e
rnel
.
org/pub
/
scm/gitk/
g
itk
commit
|
commitdiff
|
tree
2005-11-20
J
u
nio C Hamano
mer
g
e
-
one-file:
u
s
e rmdir
-
p
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
Junio C Ha
m
ano
Do
c
u
mentation: add hooks/u
p
dat
e
exam
p
le
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
Junio C
Hamano
D
o not DWIM i
n
us
e
r
p
a
th lib
r
ary u
n
der s
t
ric
t
mode
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
Junio C Haman
o
ht
t
p
.
c:
r
eor
d
e
r to
avoid compilation fai
l
ure
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
J
unio C Hamano
merge-recur
s
ive::removeF
i
le: remove empty d
i
rectorie
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
Junio C Ham
a
no
me
r
ge-one-
f
i
l
e:
remov
e
empty directories
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
Junio C Hamano
Docu
m
en
t
ati
o
n: rebase-from-inte
r
nal
m
in
o
r updates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-19
Junio C Hama
n
o
git-repack: d
o
not do co
m
plex redun
d
ancy
c
heck
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-19
J
unio C
Hamano
gi
t
-count-objects: dc re
p
lacement
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-19
Jun
i
o
C Ha
m
ano
readref
s
:
grab al
l
refs
w
i
t
h one call to ls-remote
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-19
Junio C Hamano
Merg
e
h
t
tp:/
/
w
w
w
.
ke
r
nel
.
o
r
g/pub
/
s
cm/gitk/g
i
tk
commit
|
commitdiff
|
tree
2005-11-18
Junio C Hamano
Merge branches 'jc/branch' and 'jc/reb
a
s
e
'
commit
|
commitdiff
|
tree
2005-11-18
Junio C Hamano
R
ewr
i
te rebase to
use gi
t
-
format-patch pi
p
ed
t
o gi
t
-am
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-18
Junio C Haman
o
git-branch: -f to
f
orcibly reset branch hea
d
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next
