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
Ju
n
io C Hamano
T
u
tor
i
a
l:
a
djust merge example to recursive strateg
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio
C Hamano
mer
g
e
-re
c
ursive: ma
t
c
h
t
h
e
u
n
me
r
ge
d
index entry behaviou
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio
C Ham
a
no
diff
-
files: sh
o
w diff
s
w
i
th
stage0 and
unmerged stage
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Jun
i
o C Hama
n
o
git-dif
f
: do not turn 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
ma
n
o
Merge http
:
//www
.
kernel
.
org/pub/sc
m
/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-29
Junio
C Hamano
writ
e
_name_quoted(): ma
k
e one of
t
he path
a
count
e
d
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C H
a
mano
D
o
c
umentation:
Describe merge ope
r
a
ti
o
n a b
i
t bett
e
r
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Hamano
name-rev:
fix pare
n
t countin
g
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
J
uni
o
C Hama
n
o
rebase: one sa
f
ety net
,
one bugfix
and one optim
i
zation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Jun
i
o C Hamano
M
erg
e
http
:
/
/www
.
kernel
.
or
g
/pu
b
/
scm/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
git-mv
:
quot
e
$src
in rege
x
p
pr
o
perly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Ju
n
io
C
Hamano
[PATCH] gi
t
k:
U
se i18n
.
co
m
mit
e
ncoding
c
onfi
g
uration
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Ju
n
io C Hamano
config
.
c: constness tightening to avoi
d
co
m
p
ilation
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C
Hama
n
o
mailinfo: Do not use -
u
=
<encoding>; say --encodi
n
g
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Jun
i
o
C
H
aman
o
m
a
ilinfo: Use i
1
8n
.
c
o
mmitencoding
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
m
a
ilin
f
o: al
l
ow -u to
f
all bac
k
on lati
n
1
t
o
u
tf8 conversion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hama
n
o
I
ntroduce i18n
.
co
m
mitencoding
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
Merge http://www
.
kernel
.
or
g
/pub/s
c
m
/
g
itk/gitk
commit
|
commitdiff
|
tree
2005-11-27
J
unio C Hamano
s
e
tup_gi
t
_direc
t
ory(): check repository
fo
r
mat version
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio C
Ham
a
no
init-d
b
: ch
e
ck te
m
plate a
n
d repository
f
ormat
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio
C Hamano
Check r
e
po
s
it
o
r
y for
m
at version in enter_re
p
o()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
Repository format version chec
k
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Junio C
H
amano
form
a
t
-patch: output filename report
e
d to s
t
dout ver
b
atim
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Hamano
n
a
me-rev: fix off-by-one
error in --stdin
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Junio C
H
amano
s
hel
l
.
c
:
complain on insufficient argu
m
ents
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
git-s
h
-set
u
p
:
move the repository chec
k
to a
c
ore progra
m
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
setup_git_director
y
: make sure GIT
_
DIR is a va
l
id reposi
t
ory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Ju
n
i
o
C Hamano
g
it-va
r
: make it w
o
rk in subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
git
-
sh-setup: die if out
s
i
d
e
git repository
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
J
u
n
i
o C Ham
a
no
parse-remote
a
nd ls-remo
t
e clean
-
u
p
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Jun
i
o C Ham
a
no
Preve
n
t
"
git-commit -a pa
t
h
1
path2
.
.
.
"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Ju
n
io C Hamano
config
.
c
: avoid s
h
adowi
n
g global
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
Junio C Hamano
di
f
f-t
r
ee: teach single-commit diff-tree to honour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
J
u
nio C Hamano
Teac
h
upda
t
e-ind
e
x
t
o read from ls-tr
e
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
Ju
n
io C Ham
a
n
o
g
i
t-rever
t
:
ma
k
e --edit
default
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
Junio
C H
a
mano
git-merge: make
recursive the defa
u
lt strate
g
y
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
Junio
C
H
amano
pack-redundant: type clea
n
ups
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-22
Junio C
Hamano
M
erge ht
t
p://
w
ww
.
k
ernel
.
org/
p
ub
/
scm/gitk
/
gitk
commit
|
commitdiff
|
tree
2005-11-22
Junio C Hamano
git
-
var: c
o
nstn
e
ss
a
nd glo
b
a
lness cleanup
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-22
Junio C Hamano
Move diff
.
re
n
amelimit out o
f
default configuratio
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Junio C Hamano
git-prox
y
updates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Junio C Hamano
daemon: further tweaks
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Junio C
H
aman
o
t
u
torial: setting u
p
a tre
e
for su
b
s
ystem
maintainers
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
J
unio C Hamano
rename detectio
n
w
ith -M100
m
ean
s
"exact re
n
a
m
es on
l
y"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Junio C Hamano
format-patc
h
: fix two-argument s
p
ecial case, a
n
d make
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
J
u
nio C
H
a
m
ano
Fix hook
s
/u
p
date templat
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
J
unio C Hamano
Mak
e
s
u
re he
a
ds/foo and tags/foo do not confuse things
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
J
unio
C
Hamano
F
i
x "d
o
n
o
t
DWIM"
p
atch to enter_repo"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
Ju
n
io C Hamano
M
erge h
t
t
p
://www
.
k
e
rn
e
l
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-20
Junio C
Hamano
merge-one-file:
u
se rmdir -p
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
Junio C
Hamano
Documentation: add hooks/
u
pdate e
x
ample
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
Junio C Hamano
Do
n
o
t DWIM in userpath library u
n
der
s
trict mode
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
J
unio C Hamano
http
.
c: r
e
order
t
o avoid compil
a
tion failure
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
Juni
o
C
Hamano
merge-recursiv
e
::remove
F
ile: remo
v
e
empty direc
t
orie
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
Ju
n
io C Hamano
merge-one-file: r
e
move empty directories
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
J
u
nio C H
a
mano
Documentat
i
on:
rebase-from-internal minor updates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-19
Junio C Ha
m
ano
git-repack: do not do complex redundancy c
h
eck
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-19
J
u
nio
C Hamano
git-cou
n
t-objects:
dc replacement
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-19
Junio C Haman
o
readrefs: grab all refs with
o
ne
c
all to ls
-
remote
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-19
Junio C Hamano
Merge http://www
.
kernel
.
o
rg/pub/s
c
m/g
i
tk/g
i
t
k
commit
|
commitdiff
|
tree
2005-11-18
Junio C Hamano
Merge
branches 'jc/branch' a
n
d 'jc/rebase'
commit
|
commitdiff
|
tree
2005-11-18
Junio C Hamano
Rewrite rebase to use gi
t
-format-patch piped t
o
g
it
-
am
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-18
J
unio
C
Ha
m
ano
gi
t
-bran
c
h
: -f to forcibly res
e
t branch
hea
d
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-18
Junio C
H
amano
D
o not
s
how
.
e
xe in gi
t
command lis
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-18
Juni
o
C
H
amano
C
ygwin
*
mig
h
t
* be
h
elped with NO_MMAP
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-18
Jun
i
o C
H
a
m
ano
g
i
t-
p
rune: qu
o
te p
o
ssibly em
p
ty $d
r
yrun as parame
t
er
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-18
Junio
C
H
a
ma
n
o
git-a
m
: --
b
i
na
r
y
; document --resume a
n
d --bin
a
ry
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-18
Junio C Hamano
D
ea
l
with bi
n
ary diff
o
utput from GNU diff 2
.
8
.
7
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-17
Junio C Hamano
Merge bran
c
h 'tojunio' of http://locke
.
c
a
t
alyst
.
net
.
.
.
commit
|
commitdiff
|
tree
2005-11-17
Junio C
H
a
mano
Add approxidate tes
t
calls
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-17
Junio C Hamano
test
s
:
b
inary
d
iff
a
pplication
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-17
J
u
nio C Ham
a
no
diff
:
--
f
ull-ind
e
x
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-17
Ju
n
i
o C Hamano
apply: allow-binar
y
-
r
eplacement
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-17
Junio C Hamano
git-am: --
r
eso
l
ved
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-16
J
u
nio C Hama
n
o
g
i
t-a
p
ply:
fail if
a patch
cannot be a
p
plied
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-16
Juni
o
C Hamano
git wrapper: basic fixes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-15
Junio C Hamano
s
ha1_file
.
c::ad
d
_p
a
cked_git()
:
fix
t
ype misma
t
ch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-15
Junio C Haman
o
diff: make default
r
ename detection limit co
n
figur
a
ble
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-15
Junio C Hamano
Documentation:
do not bl
i
n
dly run 'cat'
.
gi
t
/HEAD,
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-15
J
u
nio C Hamano
Update
top
o
-order t
e
st
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-15
Junio C
H
a
m
ano
apply: fix binary patch dete
c
t
i
on
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-14
Junio C Hamano
Merge branch 's
v
nu
p
'
of http://netz
.
smurf
.
n
o
r
is
.
d
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-14
Juni
o
C
Hamano
Separate LD
F
L
AGS
a
n
d
CFL
A
GS
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-14
Junio
C Hamano
Merg
e
b
r
anch 'svnup' of
h
t
tp://netz
.
smurf
.
noris
.
de
.
.
.
commit
|
commitdiff
|
tree
2005-11-13
Junio C Hamano
R
e
name lost+found to l
o
st-foun
d
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-13
Junio C Hama
n
o
Debi
a
n:
build-depe
n
d on libexpat-dev
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Hama
n
o
Ign
o
r
e
bui
l
t git-los
t
+f
o
und
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
Junio
C
Hamano
Documen
t
ation: asciidoc sources
a
re
u
t
f
-8
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
J
unio C Hamano
Re
n
ame
.
git/lost+fo
u
nd to
.
git/lost-fou
n
d
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Hamano
git-l
o
st+found
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Hamano
git
-
pru
n
e
:
p
r
une redundant
p
a
cks
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Hamano
merge-one-file:
u
s
e empty- or com
m
on
-
base
c
o
ndintionally
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
Junio C H
a
mano
Documenta
t
i
on: git-apply --n
o
-ad
d
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
Jun
i
o C
H
a
mano
merge-one-file: use
commo
n
as base,
i
n
stead of emptiness
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
Junio C
Hama
n
o
merge
with /dev/null as base
,
ins
t
ea
d
of puntin
g
O
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Ha
m
ano
I
N
STAL
L
:
duplica
t
e python requir
e
ments
f
rom Makefile
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
M
erg
e
branches 'jc/
s
b
'
and 'jc/mb'
commit
|
commitdiff
|
tree
2005-11-11
Juni
o
C Haman
o
t1200: use --to
p
o-orde
r
to keep the show-branc
h
o
utput
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Jun
i
o C H
a
m
ano
Ful
l
y detect unin
t
eresti
n
g commi
t
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Ham
a
n
o
git-
s
how
-
br
a
n
c
h:
t
ighten merge-ba
s
e comp
u
tation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next