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
Documentation: Describe merge operation a bit better.
2005-11-29
Junio C Hamano
Docum
e
nta
t
ion: Describe merge
operati
o
n a bit bett
e
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Hamano
n
ame
-
rev:
f
ix pare
n
t counting
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
J
u
n
i
o C
H
a
mano
r
ebase
:
one s
a
fe
t
y net, one bugfix and one optimi
z
ation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Jun
i
o C Ha
m
ano
Mer
g
e
http://www
.
kernel
.
org/pub/scm
/
git
k
/
g
i
tk
commit
|
commitdiff
|
tree
2005-11-28
Junio C
Hamano
git-mv: quote $
s
rc in re
g
ex
p
prope
r
ly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C
Ha
m
ano
[PATCH]
g
i
t
k: Use i18n
.
commitencoding configuration
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
J
uni
o
C Hamano
config
.
c:
c
onstness
tigh
t
ening
t
o avo
i
d c
o
mpilation
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C
Ha
m
ano
ma
i
linfo: Do not use -
u
=
<
encoding>; say --encodi
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C H
a
mano
m
a
il
i
nfo: Use
i
18n
.
co
m
mitencoding
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio
C
H
a
m
ano
mail
i
nfo
:
allow -u to fal
l
back o
n
latin1
t
o utf8 conversion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio
C
H
a
m
a
no
Introd
u
ce i18n
.
comm
i
t
enc
o
ding
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Haman
o
Merge http://www
.
kerne
l
.
org
/
pub/
s
cm/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-27
Junio C Ham
a
no
setu
p
_git_dir
e
ctory(): check rep
o
sito
r
y
f
ormat ver
s
ion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
init-db: c
h
eck tem
p
late a
n
d
rep
o
si
t
ory form
a
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
C
heck repository f
o
rma
t
version
i
n
ent
e
r_repo()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
J
u
nio
C
Haman
o
Reposit
o
ry format version
c
hec
k
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Junio C H
a
mano
format-
p
atch: output filename report
e
d to stdout
v
e
rbatim
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Junio C
H
amano
name-re
v
: fix off-by
-
one e
r
ror in --
s
td
i
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Hamano
s
hell
.
c: co
m
p
lain on i
n
suff
i
cient argum
e
nts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C H
a
mano
git
-
sh-setup: move the repository check
t
o a core p
r
ogram
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Jun
i
o C Hamano
setup_
g
it_di
r
ectory: make sure GIT_DIR is a valid
r
e
p
os
i
tory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Ju
n
i
o C Hamano
git-var: m
a
ke it
work in
s
ubdirect
o
ry
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Ju
n
io C
Hamano
git-sh
-
s
etup:
d
ie if outsid
e
git repository
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C H
a
mano
parse-remo
t
e and ls-remote
c
lean-up
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
Prevent "git-commit
-a
p
ath1 path2
.
.
.
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C
Haman
o
config
.
c: avoid
s
hadowi
n
g global
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Juni
o
C Hamano
di
f
f-tr
e
e: teac
h
si
n
gl
e
-
c
o
m
mit di
f
f-t
r
ee to ho
n
our
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Junio C Hamano
Teach update-in
d
e
x
to rea
d
fro
m
ls-tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Junio C Hama
n
o
g
i
t-revert: ma
k
e --edi
t
default
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Junio
C
Ham
a
no
git-merge: m
a
ke
recurs
i
ve the
de
f
au
l
t strategy
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Junio C Ha
m
ano
pack-redundant
:
type cleanu
p
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
Junio
C Hamano
Me
r
ge
h
ttp:
/
/www
.
ker
n
el
.
org/pub
/
scm
/
g
i
tk/gitk
commit
|
commitdiff
|
tree
2005-11-22
Junio C H
a
mano
g
i
t-va
r
: co
n
s
tness and globalness cleanup
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
J
u
nio C Hamano
Move diff
.
renamelimit out of defau
l
t configuration
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
J
u
nio C Hamano
git-proxy updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Junio C Hamano
daem
o
n: fur
t
her t
w
eaks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Junio C
H
a
mano
tutorial: setting up
a tree
for subsystem maint
a
iners
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
J
u
nio C H
a
mano
rename detecti
o
n
with -M100 me
a
ns "exact renames
only"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
J
u
n
i
o
C H
a
man
o
format-patch:
f
ix
t
wo-argume
n
t special
c
ase
,
and make
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Junio
C
Hamano
Fix
h
o
o
ks
/
update tem
p
late
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
J
unio C Hamano
Make sure heads
/
fo
o
an
d
tags/foo
do n
o
t con
f
use things
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Jun
i
o C Hama
n
o
Fix "
d
o not DWIM" patch to ente
r
_r
e
po"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
J
u
n
io
C Ha
m
ano
Merge http://ww
w
.
ke
r
ne
l
.
o
r
g/pub/scm/gitk/
g
itk
commit
|
commitdiff
|
tree
2005-11-20
J
unio C Hamano
merge-one-
f
ile: use rmdir -p
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Junio C Hamano
Documentation: add h
o
ok
s
/update example
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Junio C Hamano
Do not DWIM in userpath
l
ibrary under strict mode
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Junio C Ham
a
no
ht
t
p
.
c:
r
eo
r
der to avoid compilation
f
a
ilu
r
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Jun
i
o C
H
amano
merge-recu
r
sive::removeFile
:
remove empty d
i
rectories
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Ju
n
io C Hamano
merge-one-
f
i
l
e: remo
v
e empty direct
o
ries
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Junio C Ham
a
no
Documen
t
at
i
on:
r
ebase-from-int
e
rnal
mino
r
updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-19
J
u
nio C Ham
a
no
gi
t
-repa
c
k: do not do co
m
plex
redund
a
ncy check
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-19
Junio
C H
a
mano
git-coun
t
-objects:
dc replac
e
ment
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-19
Ju
n
io C Ha
m
ano
re
a
drefs: gra
b
all ref
s
wi
t
h
o
n
e
c
a
ll to ls
-
r
e
mote
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-19
Junio C
Ha
m
ano
Merg
e
http:
/
/www
.
kernel
.
o
r
g
/
pub/scm/g
i
tk/gitk
commit
|
commitdiff
|
tree
2005-11-18
J
u
ni
o
C Hamano
Merge br
a
nc
h
es
'jc/branch'
and 'j
c
/rebase
'
commit
|
commitdiff
|
tree
2005-11-18
J
un
i
o C Hamano
Rewrite rebase to us
e
git-format-pa
t
ch piped to git-
a
m
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
J
u
n
io C Ha
m
ano
git-branch: -f t
o
forcibly reset bra
n
ch head
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
Junio C Hamano
Do not show
.
e
xe in git command li
s
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
Ju
n
io C Hamano
Cygw
i
n *might*
be h
e
lp
e
d with NO_MMAP
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
J
u
nio C
Ha
m
a
n
o
g
i
t-pr
u
ne
:
quote pos
s
ibly empty $dryrun as paramet
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
Ju
n
io C
H
a
m
a
no
g
it-am: --binary;
d
o
c
ument
--r
e
sume
a
nd
-
-
binary
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
Junio C Haman
o
Dea
l
with binary diff outpu
t
from
G
N
U
diff 2
.
8
.
7
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
J
un
i
o C Hama
n
o
Me
r
ge branch
'tojun
i
o'
o
f http://locke
.
catalyst
.
net
.
.
.
commit
|
commitdiff
|
tree
2005-11-17
Ju
n
io C Hama
n
o
A
d
d approx
i
date test
c
alls
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
Jun
i
o C Hamano
tests:
b
in
a
ry diff a
p
plicat
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
Junio C Hamano
diff:
--
f
ul
l
-index
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
J
unio C Hamano
apply: allow-
b
inary-
r
eplacement
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
Junio
C H
a
m
a
no
git-am: --resolved
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-16
Junio C Hama
n
o
g
it-ap
p
ly:
f
a
il i
f
a
patc
h
cannot b
e
applied
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-16
Ju
n
i
o C Hama
n
o
git wrapper:
b
asic
f
ixes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
Junio C H
a
mano
sha1_fil
e
.
c::add_pa
c
ked_
g
it():
fix t
y
pe mismatch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
Junio C
Hama
n
o
di
f
f
:
make defa
u
lt re
n
ame detection limit configurable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
Junio C Ha
m
ano
D
ocumentatio
n
: do
not blin
d
l
y
run 'cat'
.
gi
t
/
H
EAD,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
J
u
nio
C Hamano
Update topo-order test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
Junio C Hamano
a
p
p
ly:
fix bina
r
y p
a
t
c
h
d
etection
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-14
Ju
n
io C
Hamano
Merge branch 'svnup' of http://net
z
.
s
murf
.
noris
.
de
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-14
J
u
n
io C Hamano
Separate LDFLAGS and
CFLAGS
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-14
Junio C H
a
mano
Merge branch 'svnup' of http://netz
.
smur
f
.
n
oris
.
de
.
.
.
commit
|
commitdiff
|
tree
2005-11-13
Junio C Hamano
Rename
lost+fou
n
d
to lost-found
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-13
Junio C Hamano
Debian: build-de
p
e
n
d on libexpat-dev
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Hamano
Igno
r
e built git-lost+found
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Hama
n
o
Docu
m
entat
i
on
:
asc
i
i
d
oc
so
u
rces are utf-8
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio
C Ha
m
ano
R
e
name
.
git/l
o
st+foun
d
to
.
g
it/lost-fou
n
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Jun
i
o C Hamano
git-lost+fou
n
d
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Hama
n
o
g
i
t-prune: prune
redun
d
ant packs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C
H
amano
mer
g
e-one-file
:
use empty- or common-
b
ase condintionally
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Hamano
Doc
u
mentat
i
on
:
g
i
t-ap
p
l
y
--
n
o-add
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Hamano
merge-one-file: use comm
o
n as base, inst
e
ad of
e
mptiness
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Hamano
mer
g
e with /de
v
/null
a
s
b
as
e
, instead
of punting O
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
J
u
nio C
H
amano
INST
A
LL:
d
uplicate python requirements from Makefile
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C
Hamano
M
er
g
e
bran
c
hes '
j
c
/sb' a
n
d 'jc/mb'
commit
|
commitdiff
|
tree
2005-11-11
J
unio
C
Ham
a
no
t1200: use --topo-order to keep t
h
e
s
h
ow-
b
ranch output
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
J
unio C
H
amano
Fully detect
u
ni
n
t
eresting
c
ommits
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
g
i
t
-sh
o
w-branch: tighten merge-
b
ase computation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Juni
o
C Ham
a
no
Add test ca
s
e for merge-base
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
J
u
nio C Hamano
m
e
rge-base: avoid unnec
e
ssary postproces
s
ing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
merge-bas
e
:
f
ully contamin
a
te the wel
l
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Juni
o
C Hamano
RPM: arch
submodule needs tla
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C
Hamano
octop
u
s
:
d
o not do AND'ed merge base
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
J
u
n
io C Hamano
Add --p
r
etty
=
fu
l
l
e
r
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next