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
J
u
nio
C
Ha
m
a
n
o
Docume
n
tation:
D
es
c
ribe merge op
e
rat
i
on a bit better
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C
H
a
m
ano
name
-
rev: fix parent
counting
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
rebase: one
saf
e
ty n
e
t, one bugfix and one op
t
imizat
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
Merg
e
http://w
w
w
.
k
er
n
el
.
org/pu
b
/sc
m
/
g
itk/g
i
t
k
commit
|
commitdiff
|
tree
2005-11-28
Junio
C Hamano
git-mv:
quot
e
$s
r
c
i
n
re
g
exp properly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio
C
H
a
m
ano
[PATCH] gitk:
U
se
i
18
n
.
commitencoding configu
r
ation
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
J
unio C
Hamano
conf
i
g
.
c
:
const
n
ess
t
i
g
h
tenin
g
to av
o
id
c
ompilation
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
mailinfo:
D
o n
o
t use -u=<encoding>; say --
e
n
c
odin
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Ham
a
no
m
ail
i
nfo: Use i18n
.
commitencoding
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
J
u
ni
o
C Ham
a
no
mailinf
o
: allow -u t
o
fall back on
l
atin1 to utf8 co
n
v
ersion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Ham
a
no
I
ntroduce
i18n
.
co
m
m
itencoding
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
J
u
nio C H
a
m
ano
Merge
http
:
/
/
www
.
ker
n
el
.
o
r
g/pub/scm/g
i
tk/gitk
commit
|
commitdiff
|
tree
2005-11-27
Ju
n
io C Ham
a
no
set
u
p_git_directory(
)
: check reposi
t
ory format version
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
in
i
t-db: check
t
emplat
e
and reposit
o
ry format
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Ha
m
ano
Check rep
o
sito
r
y form
a
t version in
e
nt
e
r_repo()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Ha
m
ano
Re
p
ository format version check
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
J
u
n
io
C Hamano
form
a
t-
p
atch
:
output filename repo
r
t
e
d
to std
o
u
t
verbatim
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Junio C
H
amano
na
m
e-rev:
f
i
x off-by-one error in --stdin
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Junio
C
Haman
o
s
h
ell
.
c
:
co
m
plain
on insu
f
f
i
c
ient arguments
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
J
unio C Hamano
git-sh
-
setup: move
t
he repository check
t
o
a core program
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Haman
o
setup_git_directory: make sure GIT_DIR
i
s
a valid reposit
o
ry
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
J
u
nio C Haman
o
g
it-v
a
r: make it work i
n
subdirec
t
or
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
J
u
nio C Hamano
git-sh-setup: die if out
s
ide git rep
o
sitory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
J
unio C Hama
n
o
parse-re
m
ote a
n
d ls-
r
e
mote clean-
u
p
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Ham
a
no
Preven
t
"
git-commit -a path1
path
2
.
.
.
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
J
u
n
i
o
C Haman
o
con
f
ig
.
c: avoid sha
d
o
w
ing glob
a
l
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Junio C
H
amano
diff-t
r
ee: teach single-commit d
i
ff-tree
to honour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Junio C Hamano
Teach
u
pdate-i
n
dex
t
o rea
d
fr
o
m ls
-
tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Junio C Hamano
g
i
t-revert: make --edit def
a
ult
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Junio C Ham
a
no
git-
m
erge: make recursive the
default strat
e
gy
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Junio
C
H
a
mano
pack-
r
edundant: t
y
p
e cl
e
anups
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
J
unio C Hamano
Merg
e
ht
t
p
://w
w
w
.
k
e
rnel
.
org/
p
ub/scm/gitk
/
gitk
commit
|
commitdiff
|
tree
2005-11-22
Junio C Hamano
git-va
r
: cons
t
ness and globalness cleanup
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
J
unio
C
H
a
mano
Move
diff
.
renamelimit out of d
e
fault configuratio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Ju
n
io C
H
amano
git-pro
x
y
u
pd
a
tes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
J
u
n
io
C
Haman
o
daemon: fur
t
he
r
tweaks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Juni
o
C
Ham
a
no
tut
o
rial:
s
ettin
g
up a tree for
s
ubsyst
e
m ma
i
nta
i
ners
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Juni
o
C
Hamano
ren
a
m
e
d
e
tection with -M100 means "exact renames only"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Junio C
Hamano
format-
p
atch: fix tw
o
-argument special case, and make
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Junio C Hamano
Fix
h
ooks/
u
p
d
ate temp
l
ate
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
J
u
nio C
Hamano
M
a
ke sure h
e
a
d
s/foo a
n
d tags/f
o
o
do
not confuse things
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Junio C Hamano
Fix
"
d
o
n
ot DWI
M
" patc
h
t
o
ent
e
r_re
p
o"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
J
u
nio C Hamano
M
erge http:/
/
www
.
ke
r
nel
.
o
rg/pub/scm/gitk
/
g
itk
commit
|
commitdiff
|
tree
2005-11-20
Jun
i
o
C
Ha
m
ano
merg
e
-one-file: use rm
d
ir -
p
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Junio C Hamano
Do
c
umentation:
add hooks/updat
e
e
xample
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
J
unio C Hamano
D
o
not DWI
M
in userpath
library und
e
r strict mode
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Junio C Hamano
http
.
c: reor
d
er to avoid
c
ompilation fai
l
ure
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Junio
C H
a
ma
n
o
merge-
r
ec
u
rsive::remove
F
ile: r
e
move empty directories
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Junio C Hamano
merge
-
one-file: remove empty directories
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Jun
i
o
C Haman
o
Docu
m
entation: rebase-from
-
intern
a
l mi
n
or updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-19
Junio C Ham
a
no
gi
t
-re
p
ac
k
: do n
o
t do comp
l
e
x redundancy check
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-19
Junio C
Hamano
git-c
o
unt
-
objects: dc repla
c
ement
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-19
Junio
C Hamano
read
r
efs: g
r
ab
a
ll refs w
i
th o
n
e call to ls-r
e
mot
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-19
J
u
nio C
Hamano
Mer
g
e http:
/
/www
.
kernel
.
o
r
g
/pub/sc
m
/gitk/gi
t
k
commit
|
commitdiff
|
tree
2005-11-18
Junio
C Haman
o
Merge branche
s
'
j
c/branch' and
'jc/reba
s
e'
commit
|
commitdiff
|
tree
2005-11-18
Junio
C
Hamano
Rewrite
r
ebase to
u
se gi
t
-format-patch pip
e
d to git-
a
m
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
J
u
nio C Haman
o
g
it-branch: -f
t
o forcibly
r
eset bran
c
h
hea
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
J
unio C Hamano
D
o no
t
show
.
e
x
e in git command list
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
J
u
n
io C
Hamano
Cygwi
n
*mig
h
t* be
help
e
d with
N
O_MMAP
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
Junio C
Hamano
git-prune: quote possi
b
l
y
e
mpty $dry
r
un as
p
arameter
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
Ju
n
io C Hamano
git-am: --binar
y
; document
-
-r
e
s
ume and --binary
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
Juni
o
C
Haman
o
D
e
al wi
t
h binary di
f
f o
u
tpu
t
from GNU diff 2
.
8
.
7
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
Junio C Hama
n
o
Merge branch 'tojunio'
o
f http://locke
.
ca
t
a
l
y
s
t
.
net
.
.
.
commit
|
commitdiff
|
tree
2005-11-17
J
u
nio C
H
ama
n
o
Add appro
x
idate te
s
t calls
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
Junio C Hamano
tests: b
i
n
ary diff application
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
Jun
i
o C Hamano
diff: --full-index
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
Junio C Hamano
apply: allo
w
-
b
i
n
ary-replacemen
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
J
u
n
i
o C
H
a
mano
git-am
:
-
-
res
o
lved
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-16
J
u
nio C Haman
o
g
it-apply: f
a
il if a patch can
n
ot be applied
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-16
Junio C Hamano
git wrapper: basic
fixes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
Jun
i
o C Ham
a
no
sha1
_
file
.
c:
:
add_pa
c
ked_git(): fi
x
t
ype mism
a
tch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
Junio
C
H
a
mano
diff: ma
k
e
d
efault rename dete
c
t
i
o
n
l
imit config
u
rable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
Junio
C Hama
n
o
Do
c
umentat
i
on: do not blindly
r
un 'c
a
t'
.
gi
t
/HEAD,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
Junio
C H
a
mano
Update topo-order test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
Junio C Hamano
apply: fix binary pa
t
ch detect
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-14
J
unio C Hamano
Merge
b
ranch 'sv
n
up'
of http://netz
.
smurf
.
n
ori
s
.
de
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-14
J
unio C Hamano
Separa
t
e LDFLAGS and CFLAGS
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-14
J
un
i
o C Hamano
Merge branch 'svnup' of h
t
t
p://netz
.
smu
r
f
.
noris
.
de
.
.
.
commit
|
commitdiff
|
tree
2005-11-13
Juni
o
C Hamano
R
e
name lost+found to lost-found
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-13
Junio C Hamano
D
e
bian: build-
d
epend
o
n libexpat-de
v
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Ju
n
io C H
a
mano
Ignore built git-
l
o
st+fo
u
nd
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
J
u
nio C Ha
m
a
no
Docu
m
enta
t
i
on:
a
sciidoc s
o
u
rces are
utf-8
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C
H
a
m
ano
Renam
e
.
g
i
t/l
o
s
t
+fo
u
nd
t
o
.
gi
t
/lost-found
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Ju
n
io C
Haman
o
gi
t
-lost+found
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
J
u
nio
C
Hamano
git-pr
u
ne: prune re
d
undant
p
ac
k
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio
C
H
a
mano
m
e
rg
e
-one-
f
ile: use
e
m
p
ty- or common-base condintionally
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Hamano
Documentation:
git-ap
p
ly --no-add
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
J
u
nio C H
a
mano
merge-one-file: us
e
common
a
s b
a
se,
i
n
s
tead of emptine
s
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C
H
amano
merg
e
with /dev/null as b
a
se, i
n
st
e
ad of punting O
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
IN
S
T
A
LL: duplica
t
e python requ
i
re
m
e
n
ts from M
a
kefile
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Ju
n
io C Ham
a
no
Merge br
a
nches 'jc/
s
b' and 'jc/
m
b
'
commit
|
commitdiff
|
tree
2005-11-11
J
u
nio C Ha
m
ano
t1200: us
e
--topo-order to keep the sho
w
-br
a
nch
o
ut
p
ut
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Juni
o
C
H
amano
Fully d
e
tect un
i
nteres
t
ing
c
om
m
i
t
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C
H
a
mano
git-show-branch:
t
ighten merge-base computation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio
C
H
amano
A
dd test case for me
r
ge-ba
s
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C
H
amano
merge-base:
a
void unnecess
a
ry po
s
tpro
c
essing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Jun
i
o
C Haman
o
m
e
r
ge-ba
s
e: fully
c
ontaminate
t
he w
e
l
l
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hama
n
o
RPM: a
r
c
h
submodule needs tla
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio
C
Ham
a
no
octo
p
us: do not do AND'
e
d merge base
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Juni
o
C Hamano
Add --p
r
etty
=
f
u
ller
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next