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
merge-recursive: match the unmerged index entry behaviour with merge-resolve
2005-11-30
Jun
i
o C Hamano
merge-rec
u
rsive: m
a
tch the unmerged
i
ndex entry behavio
u
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hama
n
o
diff-f
i
les: show diffs with st
a
g
e
0 and unmerged st
a
ge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
git-diff: do not tur
n
o
f
f -p/-M wi
t
h
an
y
diff options
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
i
o
C Haman
o
M
erge http:/
/
w
ww
.
kern
e
l
.
org/pub/scm/gitk/git
k
commit
|
commitdiff
|
tree
2005-11-29
Junio
C H
a
m
a
no
write_n
a
me_quoted():
make o
n
e o
f
the path a counted
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
Docum
e
ntation: De
s
cribe merge operation a bit bett
e
r
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
name-rev:
fix par
e
nt counting
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
rebase
:
one safety net, o
n
e bugfix and one op
t
imization
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Jun
i
o
C
Ham
a
no
Merge
http://www
.
k
e
r
nel
.
org/pub
/
scm/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-28
Junio C
H
am
a
no
gi
t
-mv:
q
uo
t
e
$sr
c
i
n
regexp prope
r
ly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Haman
o
[
PATCH
]
gitk: Us
e
i18n
.
commitenc
o
d
i
ng configuration
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
J
unio C Hama
n
o
config
.
c: constness tigh
t
ening to avoid c
o
mpilation
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Juni
o
C
Hamano
mail
i
nfo: Do not use -u=
<
encodi
n
g>
;
say --encoding
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
J
unio C Hamano
mailinfo: U
s
e i
1
8n
.
com
m
itencoding
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
maili
n
f
o
:
allow -u to fall bac
k
on la
t
in
1
to
utf8
conversion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
I
n
trodu
c
e i18n
.
comm
i
tenc
o
di
n
g
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Ju
n
io
C Hamano
Merge http://www
.
kernel
.
org/pub/scm/
g
itk/gitk
commit
|
commitdiff
|
tree
2005-11-27
J
unio C
Hamano
se
t
up_gi
t
_
d
ire
c
tory
(
): check repo
s
itory format version
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio C H
a
mano
init-db: check t
e
mplate and r
e
pository f
o
r
m
at
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
Ch
e
ck repository format version in ent
e
r_r
e
po()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio
C
Hamano
R
epos
i
tory
f
o
r
mat version check
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Jun
i
o C Hamano
format-patch:
o
utput filen
a
me repor
t
ed
t
o stdout
v
erbatim
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Ju
n
io C Hamano
name
-
rev:
fix off-
b
y-o
n
e error
i
n --stdi
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Junio C
Hamano
shell
.
c: complain
o
n
insufficient
a
rguments
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
gi
t
-sh-set
u
p:
m
ov
e
the repository chec
k
to a core
program
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
s
e
tup_git_directory:
m
a
k
e sure
G
I
T_DIR
i
s a valid repository
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Juni
o
C
Ha
m
ano
git-v
a
r:
make it
work in subdirecto
r
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
J
u
nio C Ham
a
no
gi
t
-
s
h-setup: die if outs
i
de git reposito
r
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
pa
r
se-remote and
l
s-remote clea
n
-u
p
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio
C Hamano
Prevent "g
i
t-co
m
mit -a
path1 path
2
.
.
.
"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C H
a
man
o
c
o
nfig
.
c
: avoi
d
shadowin
g
globa
l
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
Junio C Ham
a
no
diff
-
tr
e
e: tea
c
h single-
c
omm
i
t
diff
-
tree to
h
onour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
J
unio C Hamano
Teac
h
update-index t
o
r
e
a
d from ls-tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
Junio C Hamano
git
-
revert: make --edit defa
u
lt
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
Juni
o
C Hamano
git
-
me
r
ge: make recur
s
ive the
default strategy
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
Junio C Hamano
pack-redundant: type cleanu
p
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-22
Junio C Hamano
Merge htt
p
://www
.
kernel
.
org/pub/scm/gi
t
k/gitk
commit
|
commitdiff
|
tree
2005-11-22
Junio C
Hamano
git-var: constness 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
.
r
en
a
melimit ou
t
o
f
d
e
fault config
u
r
ati
o
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Junio C Hamano
g
it-proxy
u
p
date
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Junio C Hamano
dae
m
on:
furt
h
er twea
k
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Junio
C
Hamano
tutorial:
set
t
ing
up
a tree for
subsystem maintainers
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Juni
o
C Hamano
rename dete
c
tion
w
ith
-
M
1
00 m
e
ans "exa
c
t renames only"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Junio
C
Hama
n
o
format-pa
t
ch: fix two
-
arg
u
ment spe
c
i
al case, and
make
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
J
u
n
io C Hamano
F
ix hooks
/
u
p
d
a
t
e
templ
a
te
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Junio C H
a
mano
Make sure heads/foo and
tags/foo do not confuse things
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
J
u
nio C Hamano
Fix "do not
D
WIM" patch to enter_repo"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
Juni
o
C Ham
a
no
Merge http:
/
/www
.
kernel
.
org/pub/scm/gitk
/
gitk
commit
|
commitdiff
|
tree
2005-11-20
J
unio
C
H
am
a
no
m
e
rg
e
-one-file: use rmd
i
r -p
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
Junio C Hamano
Docume
n
t
a
t
ion
:
add hooks/update examp
l
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
Junio C Hamano
Do
n
ot DWIM in
u
serpath library
under strict mo
d
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
J
u
nio C Hamano
htt
p
.
c:
r
e
order to
a
voi
d
co
m
pilat
i
o
n f
a
i
lure
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
Juni
o
C Ha
m
a
no
merge-recursive::removeFile: re
m
o
v
e
e
mpty 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-fil
e
: remove empty directories
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
Junio C Hamano
D
o
cumenta
t
io
n
: re
b
ase-fr
o
m-
i
nternal minor
u
pda
t
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-19
Junio C Ha
m
ano
git-repac
k
:
do not do comp
l
ex redunda
n
cy check
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-19
Junio C H
a
m
ano
g
i
t-count-object
s
: d
c
re
p
l
acement
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-19
Junio C Hamano
readr
e
fs: grab all ref
s
w
ith
o
ne call to ls-remote
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-19
Junio C Hamano
Merge h
t
tp://ww
w
.
kernel
.
org/
p
ub/
s
cm/gitk/gi
t
k
commit
|
commitdiff
|
tree
2005-11-18
Junio C Hamano
M
erge b
r
anc
h
es 'jc/branch'
an
d
'jc/rebase'
commit
|
commitdiff
|
tree
2005-11-18
Junio C Hamano
Rewrite
r
ebase to use
git-f
o
rm
a
t-patch piped to git-am
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-18
J
u
n
io C Hamano
git-branch: -f to forci
b
ly reset branch head
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-18
Junio C Hamano
Do
n
o
t
show
.
exe in
g
it command l
i
st
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-18
J
un
i
o C Hamano
Cygwin *
m
ight*
be
hel
p
ed
with
NO_
M
MAP
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-18
Ju
n
io C Hama
n
o
git-prune: quote po
s
sibly empty $dryrun a
s
p
a
rameter
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-18
Junio C
Haman
o
g
i
t-
a
m
:
--bin
a
r
y
; docu
m
en
t
--r
e
sume and --b
i
n
a
ry
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-18
Junio C Hamano
De
a
l
with binary di
f
f outp
u
t from
GNU diff 2
.
8
.
7
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-17
Juni
o
C Ha
m
ano
Merge branch 'tojunio'
of http://locke
.
ca
t
al
y
st
.
net
.
.
.
commit
|
commitdiff
|
tree
2005-11-17
Junio C H
a
mano
Add approxidate
t
est calls
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-17
Junio C H
a
mano
tests: binary diff a
p
p
l
i
c
ation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-17
Junio C Haman
o
diff
:
--full
-
i
ndex
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-17
Junio
C Ham
a
no
a
pply: al
l
ow-binar
y
-
replace
m
e
n
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-17
Junio C Hamano
gi
t
-am: --r
e
solved
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-16
Junio C Hamano
git-ap
p
ly
:
fail
i
f a p
a
tch
ca
n
not be applied
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-16
Jun
i
o C
H
am
a
no
g
it wrapper: b
a
sic fixes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-15
Junio C
H
amano
sha1_file
.
c::add_packed_g
i
t(): fix
typ
e
mismatch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-15
Ju
n
i
o
C Hamano
diff: make de
f
a
ult
r
e
name
de
t
ection limit confi
g
u
r
able
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-15
Junio C H
a
mano
Documentation: do not b
l
indly run '
c
at'
.
git/HEAD,
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-15
Junio C
H
amano
Update topo-order test
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-15
Jun
i
o
C
Hamano
apply: fi
x
binary patc
h
detection
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-14
Junio C
Hama
n
o
Mer
g
e br
a
nch '
s
vnup'
of ht
t
p://netz
.
smur
f
.
noris
.
de
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-14
Junio C Hamano
S
e
parat
e
LDFLAGS a
n
d
C
F
LAGS
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-14
Junio
C
Hamano
Merg
e
branch 'svnup' of
http://n
e
t
z
.
smurf
.
nor
i
s
.
d
e
.
.
.
commit
|
commitdiff
|
tree
2005-11-13
Junio C
Hamano
Rename lost+found to l
o
st-found
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-13
Junio C Hamano
Debian: build-depend o
n
li
b
expat-de
v
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Hamano
I
gnor
e
b
u
ilt git-l
o
s
t+found
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Hamano
D
o
c
umentat
i
on: ascii
d
oc
so
u
rce
s
a
re utf-8
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
J
u
nio C Hamano
Rename
.
git/lost+found to
.
git/lost-
f
ound
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Haman
o
g
i
t
-lost+found
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
J
unio
C Haman
o
git-prun
e
: pr
u
ne redundant packs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
Junio C
H
a
mano
merge-one-file:
use empty-
o
r
c
ommon-
b
ase
c
o
n
d
i
nt
i
onally
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
Junio
C Hamano
D
ocumentat
i
on: git
-
apply --no-add
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Hamano
me
r
ge-one-file:
use
comm
o
n
a
s
b
ase, inste
a
d o
f
e
mptiness
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-12
Junio C H
a
mano
merge with /dev/null as base, instead o
f
punting
O
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Ju
n
io C
Hama
n
o
I
N
STAL
L
: duplicate python requirements fr
o
m M
a
ke
f
ile
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
Merge branc
h
es '
j
c/sb' and 'jc/mb'
commit
|
commitdiff
|
tree
2005-11-11
Jun
i
o C
H
a
m
a
n
o
t12
0
0: use --
t
opo-order to keep
the show
-
branch output
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-11
Juni
o
C Hamano
Fully dete
c
t
uninte
r
esting commits
.
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
Junio C
H
amano
Add tes
t
c
ase for merge-base
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next