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
Tutorial: adjust merge example to recursive strategy.
2005-11-30
Junio C Hamano
Tutorial: a
d
just merge
e
xam
p
le to
recursive strategy
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Ju
n
i
o C Hamano
m
erge
-
recur
s
ive: ma
t
ch
t
h
e unme
r
ged index entry
b
e
haviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Haman
o
dif
f
-files
:
show
d
i
f
fs with stage0 and unmerged stage
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
g
it
-
diff
:
do not tur
n
off -p/-M with any diff op
t
ions
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C H
a
m
ano
Merge http://www
.
kernel
.
o
r
g/pub/scm/
g
i
t
k/
g
i
tk
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
w
r
ite_n
a
m
e
_quoted
(
): ma
k
e
o
ne of
t
he path
a
counted
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C Hamano
Doc
u
mentation: Describ
e
merge operation a bit be
t
ter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
n
io C Ha
m
ano
name-rev: fi
x
parent cou
n
ting
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Ju
n
io C H
a
man
o
r
e
base: one safety net,
on
e
bugfix and one
o
ptimizati
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
J
unio C
Hamano
Mer
g
e
http
:
//www
.
kernel
.
o
rg/pub/scm/
g
itk/
g
itk
commit
|
commitdiff
|
tree
2005-11-28
Junio
C
H
amano
g
i
t-
m
v: quo
t
e $src
in regexp properly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio
C
Hamano
[PA
T
C
H] gitk: Use i18n
.
c
ommiten
c
odin
g
configuration
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
config
.
c: constness tig
h
tening
to avoid co
m
pilat
i
on
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
m
a
i
l
i
n
fo: Do
n
o
t
u
se -u=<encodin
g
>;
say --encoding
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Ju
n
io C Hamano
mailinfo: Use
i
1
8n
.
commite
n
coding
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
J
u
nio
C
Ham
a
no
mailin
f
o: allow -u to fall bac
k
on
l
atin1 to utf8 co
n
version
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Ha
m
ano
I
n
trodu
c
e i1
8
n
.
commi
t
encoding
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Ha
m
ano
Mer
g
e ht
t
p:
/
/www
.
ker
n
el
.
o
r
g/pub/scm/gitk/
g
itk
commit
|
commitdiff
|
tree
2005-11-27
Junio
C
H
amano
set
u
p_git_directory(): chec
k
r
e
p
osi
t
ory format version
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
init-db
:
check t
e
mp
l
a
t
e and repository format
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Juni
o
C
H
a
mano
Check repos
i
t
o
ry format
version in
ente
r
_repo()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
Repo
s
itory format versio
n
chec
k
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Ju
n
io C H
a
m
a
n
o
format-patch: o
u
tput fil
e
n
ame reported to stdo
u
t
v
erbatim
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Jun
i
o
C Hamano
n
ame-rev: fix off-b
y
-one error i
n
--stdin
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
J
u
nio
C
H
ama
n
o
s
hell
.
c: co
m
pl
a
i
n on
i
nsufficient arguments
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
J
u
nio C Hamano
git
-
sh-
s
e
t
up: move the
r
epository c
h
eck
to a core program
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
s
e
tu
p
_git_direct
o
ry:
m
ake
sure GIT_DIR is a valid repository
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
git-var:
make it work in subdire
c
tory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
git-sh-se
t
up: die if outside git repository
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
J
unio C Ham
a
no
pa
r
se-remote and ls-re
m
ote c
l
ean-up
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio
C Hamano
P
r
e
v
ent
"git-commit -a path1 pa
t
h2
.
.
.
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
c
o
n
fig
.
c:
avoid shadowing global
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Juni
o
C
H
a
mano
diff-tree: te
a
ch single-commit diff-
t
ree to
hono
u
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
J
unio
C
Hamano
T
each upda
t
e-index to re
a
d
f
r
o
m ls-tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Junio C
H
amano
git-revert: make
-
-edit def
a
ul
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Jun
i
o
C
Ham
a
no
git-me
r
ge: make
r
ec
u
rsive the defa
u
lt s
t
rat
e
gy
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Junio
C H
a
mano
pack-redundant: typ
e
cleanups
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
J
u
nio C Hamano
Merge http://www
.
kernel
.
o
rg
/
pub/s
c
m/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-22
Junio C Hamano
git-v
a
r: const
n
ess an
d
g
l
obal
n
e
ss cl
e
anup
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
Junio C
Haman
o
Move diff
.
rena
m
elimit out of default co
n
figuration
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Junio C Ha
m
an
o
gi
t
-p
r
oxy up
d
ates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Jun
i
o C Hamano
dae
m
on: f
u
rther
t
weaks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Jun
i
o C
H
amano
tut
o
rial: setting up
a
tre
e
for subs
y
s
tem maintainers
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Ju
n
io C H
a
mano
rename detecti
o
n wit
h
-M100
mea
n
s "exact
renames only"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
J
un
i
o C Haman
o
form
a
t-p
a
tch: fix
tw
o
-argumen
t
spec
i
al case,
a
nd
m
ake
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Junio
C
Hamano
F
i
x
h
ooks/u
p
date template
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Junio C Hamano
Make sure hea
d
s
/
foo and tags/foo do not confuse
things
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Junio C Hamano
Fix "do not D
W
IM" p
a
tch
t
o
enter_rep
o
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Junio C Ham
a
no
Merge http://ww
w
.
kernel
.
org/pub/scm/gitk/gi
t
k
commit
|
commitdiff
|
tree
2005-11-20
Junio
C
Hamano
merge-
o
ne-file: use rmd
i
r -p
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Juni
o
C Ha
m
ano
Docum
e
n
t
a
t
ion: add hooks/update exam
p
le
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Junio C Hamano
Do not DWIM in userpath li
b
rary under
s
trict mode
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Junio C
H
amano
http
.
c
:
r
eorder to
avoid compilation failure
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Jun
i
o
C
H
amano
mer
g
e-recursive::removeFil
e
: remove
e
mpty
d
ire
c
t
ories
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Junio C Ha
m
ano
mer
g
e-one-file:
remove
empty d
i
rectories
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Junio C Hamano
Documen
t
atio
n
: reb
a
s
e
-from-
i
nternal minor up
d
ates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-19
J
u
n
io C
Hama
n
o
g
it-repack: do not do complex redu
n
dancy check
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-19
J
unio C H
a
mano
g
i
t
-count-objects: dc repla
c
e
ment
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-19
Junio
C
Hama
n
o
readrefs: grab all refs with one
call to ls-remo
t
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-19
Junio C Hamano
Merge http://www
.
kerne
l
.
org/
p
ub/scm/git
k
/g
i
tk
commit
|
commitdiff
|
tree
2005-11-18
Junio C
H
amano
Merge bran
c
hes 'jc/br
a
nch' an
d
'j
c
/rebas
e
'
commit
|
commitdiff
|
tree
2005-11-18
Junio C Hamano
Rewrite rebase to
u
se git
-
format-patch piped to git-am
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
Junio C Ham
a
no
git-bra
n
ch:
-
f to
forcibly r
e
se
t
branch
h
ead
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
Ju
n
io C Ha
m
ano
D
o
not
s
h
ow
.
exe in g
i
t command list
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
Jun
i
o C Hama
n
o
Cygwin *might*
b
e
h
e
l
p
e
d with NO_MMAP
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
Junio C Hamano
git-
p
r
une: quote
possibly empty
$dryrun as parameter
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
Junio C H
a
ma
n
o
git-am: --
b
inary; documen
t
--resume and --binary
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
Junio C
H
amano
De
a
l with binary diff outpu
t
from GNU diff 2
.
8
.
7
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
Junio C Ha
m
ano
Merg
e
branch
'
tojun
i
o' of http://locke
.
cata
l
yst
.
net
.
.
.
commit
|
commitdiff
|
tree
2005-11-17
Junio C Hamano
A
dd
a
ppro
x
i
d
ate test c
a
lls
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
Ju
n
io C Hama
n
o
t
e
sts: binary diff a
p
plication
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
Ju
n
i
o C Hamano
d
i
ff: --full-in
d
ex
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
J
unio C Hamano
a
pply: al
l
o
w
-
binary-repla
c
ement
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
Junio
C
Hamano
g
it-am: --resolved
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-16
Jun
i
o C Hamano
g
i
t-apply: fail
i
f a patch can
n
ot
b
e ap
p
lied
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-16
Junio C Haman
o
git wrap
p
er: bas
i
c fixes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
Junio C Haman
o
sha1_file
.
c
:
:add_packed_git(): fix type
m
is
m
at
c
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
Junio
C
Hamano
diff: make
d
efau
l
t
rename d
e
tection limit c
o
nfigurable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
Ju
n
i
o
C
H
aman
o
Doc
u
men
t
a
t
ion: d
o
not b
l
indly
r
un 'cat'
.
git
/
HEAD,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
Junio C Ham
a
n
o
Update topo-order te
s
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
J
u
nio C Ha
m
ano
appl
y
:
f
ix binary
p
at
c
h
detection
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-14
J
unio C H
a
mano
Merg
e
branch 'svnup' of http://netz
.
smurf
.
noris
.
de
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-14
Junio C Ha
m
ano
Sepa
r
ate LDFLAGS and CFL
A
GS
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-14
Junio C Hamano
Merge bra
n
ch 's
v
nup' of
http://
n
etz
.
smu
r
f
.
no
r
is
.
de
.
.
.
commit
|
commitdiff
|
tree
2005-11-13
Junio C Hamano
Rename lost+found to lost-
f
ound
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-13
J
u
n
i
o C Ha
m
an
o
Debian: buil
d
-depend
o
n li
b
expat
-
dev
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Hamano
Ig
n
ore buil
t
g
it-lost+fo
u
nd
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
J
unio C
H
amano
Documentation: as
c
iidoc sources are utf-8
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
J
un
i
o C Hamano
Ren
a
me
.
git
/
lost+found
to
.
g
it/lo
s
t-fo
u
nd
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Ju
n
i
o C Hamano
git-lost+found
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Hama
n
o
git
-
p
r
une:
p
rune
redundant packs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Hamano
merg
e
-
o
ne-file: use empty- or common-bas
e
c
ondintionally
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Hamano
Do
c
umen
t
ati
o
n
:
g
it-apply
--no-add
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Juni
o
C Ha
m
ano
mer
g
e-o
n
e-f
i
le: use
commo
n
a
s base, instead o
f
emptiness
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Hamano
merge w
i
th
/
dev/
n
ull as
base, instead of punting O
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
J
u
nio C Hamano
INSTALL:
duplicate pyth
o
n r
e
quirem
e
nts from Make
f
ile
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
Merge branch
e
s 'jc/sb' an
d
'jc/
m
b'
commit
|
commitdiff
|
tree
2005-11-11
Juni
o
C Hamano
t
1
200: use
-
-topo-order t
o
keep
t
h
e show-br
a
n
c
h
o
utput
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C
Hamano
F
ully
detect uninteresting commits
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Haman
o
git-sh
o
w-branch
:
ti
g
h
t
en mer
g
e-ba
s
e comp
u
tation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next