repo.or.cz
/
git
/
ericb.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
Junio
C
H
a
mano
merge-r
e
cursi
v
e
:
m
a
t
ch the unmerged index entry beh
a
viour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio
C Ham
a
no
diff-files: show diffs
with stage0 and
u
nmerg
e
d s
t
a
ge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
git-diff
:
do not turn off -p/-M with any diff options
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C H
a
mano
Merge http://www
.
kernel
.
org/p
u
b/scm/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio
C
H
a
mano
wri
t
e_name_qu
o
ted(): make one of
t
h
e path a counte
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
Docum
e
nta
t
ion: Describe
merge o
p
eration a bi
t
bet
t
er
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C Hamano
name-r
e
v: fix parent cou
n
ting
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Ju
n
io
C
Ham
a
no
rebase: one safety net, on
e
bugfix and one optimiz
a
t
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
Mer
g
e
h
ttp
:
//
w
ww
.
kernel
.
org/pub/scm/gitk/g
i
tk
commit
|
commitdiff
|
tree
2005-11-28
J
u
nio C
H
amano
git-
m
v: quote
$
src in regexp
p
roperly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Ju
n
io C Hamano
[PATCH]
g
i
tk: Use
i18n
.
c
ommitencod
i
ng
c
onfiguration
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
co
n
fig
.
c: co
n
s
t
ness tightening to
avoid compilation
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Juni
o
C
H
amano
m
a
ilinfo:
D
o
n
ot
use -u=<enco
d
ing>;
s
a
y --
e
ncodin
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
J
unio C Ham
a
no
ma
i
l
info
:
Use i18n
.
commitencoding
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Ju
n
io C Ham
a
no
mailinfo: allow
-
u to fal
l
b
a
ck on latin
1
to utf8 conversio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio
C Hamano
Introduc
e
i
1
8n
.
commi
t
encoding
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C
Hamano
Merge http://www
.
k
e
rnel
.
org/pub/scm/g
i
tk/gitk
commit
|
commitdiff
|
tree
2005-11-27
Junio C Haman
o
set
u
p_g
i
t_directory(): check rep
o
sitory format ver
s
ion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
J
u
nio C Hamano
init
-
db: ch
e
ck template and repository for
m
a
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
Ch
e
c
k
r
e
po
s
i
tory format v
e
r
sion in enter_repo()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
Repository f
o
r
m
at
ve
r
sion
c
heck
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Jun
i
o C Ha
m
ano
format-
p
atch: o
u
t
p
ut filen
a
m
e reported t
o
stdo
u
t verbatim
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
J
un
i
o C Hamano
name-rev: fix off-by-one error in --stdin
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Jun
i
o C Hamano
she
l
l
.
c: complain on ins
u
ff
i
cient
a
rguments
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
g
it-sh-setup:
move the repository
c
heck
t
o
a
core program
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C
H
amano
setup_git_directory: make su
r
e
GIT
_
DIR is
a va
l
i
d
re
p
ository
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
g
i
t
-var: make it wo
r
k in subdirecto
r
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C
Hama
n
o
git-
s
h-
s
etup: die i
f
out
s
ide gi
t
repository
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio
C
Hamano
par
s
e-remote and ls-r
e
m
o
t
e
clean-up
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
J
u
n
i
o C Hamano
Prev
e
nt "git-commit -a path1 path
2
.
.
.
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio
C Hamano
config
.
c:
avoid
s
ha
d
o
w
ing g
l
obal
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Junio C
Hama
n
o
diff-tree: teach
s
in
g
le-
c
ommit diff
-
tr
e
e to honour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
J
u
nio C Ham
a
no
Teach update-index
t
o
read
f
ro
m
ls-tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Junio C Ham
a
no
git-revert: make --edit d
e
fault
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Juni
o
C Ha
m
a
n
o
git-merge: make recur
s
ive the default
stra
t
egy
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Junio C Ha
m
ano
pack-redundant: ty
p
e cleanups
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
J
u
nio C Hamano
M
e
rge
http:/
/
www
.
kernel
.
org/pub/scm/git
k
/gitk
commit
|
commitdiff
|
tree
2005-11-22
Junio C Hamano
git-var:
constness a
n
d globalness cleanup
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
Junio C Hamano
Move diff
.
rename
l
imit
out of
defa
u
l
t confi
g
uration
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Junio C Hamano
git-pro
x
y updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Junio C
Hamano
daemon: further tweak
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Juni
o
C
H
a
m
a
no
tut
o
r
ial: se
t
ti
n
g u
p
a tree for s
u
bsystem maintainers
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
J
u
nio C
H
a
m
a
n
o
rename detection with -M100
means "exac
t
r
enames o
n
l
y"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Juni
o
C
Ha
m
an
o
format-patch: fix two-argument special case, and make
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Juni
o
C Hama
n
o
Fi
x
hooks/
u
pdate template
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Junio C Ham
a
no
Ma
k
e
sure
h
eads
/
f
o
o
and tags/foo do not confuse thi
n
gs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Jun
i
o C
H
amano
Fi
x
"d
o
not DW
I
M"
p
atch to enter_re
p
o
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Junio C Ham
a
no
M
e
rge http://www
.
ke
r
n
e
l
.
org/pub/sc
m
/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-20
Junio C
Hama
n
o
m
er
g
e-one-file: use rmdir -
p
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Junio C Ha
m
a
no
Documentation
:
add hooks/u
p
date ex
a
mple
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Ju
n
io C Hamano
Do not DWIM in userpath
library un
d
er strict mode
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Junio C Hamano
http
.
c: reorder to avoid compilation failure
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Junio C Hamano
m
erge-recursi
v
e:
:
removeFile:
remove empty
direct
o
ri
e
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Juni
o
C H
a
m
ano
merge-one-file: remove emp
t
y directories
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Junio C Ham
a
no
D
o
cumen
t
at
i
on: r
e
base-from-interna
l
minor updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-19
Junio C H
a
man
o
git-repack
:
do not do com
p
lex redunda
n
cy check
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-19
Junio C Hamano
git
-
count-obj
e
cts: dc r
e
plac
e
ment
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-19
Junio
C
Hamano
readrefs: grab
a
ll refs with o
n
e call to
l
s-r
e
mote
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-19
Junio
C Haman
o
Merge http://www
.
kernel
.
org/pub/scm/gitk
/
gitk
commit
|
commitdiff
|
tree
2005-11-18
Jun
i
o
C
Hamano
Merge branches 'jc/branch' and 'jc/r
e
base'
commit
|
commitdiff
|
tree
2005-11-18
J
u
nio C Hamano
Rewrite rebase to use git-format-patch
piped to g
i
t-am
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
Jun
i
o C Hamano
git-bra
n
ch: -f to f
o
rcibly reset branch head
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
Junio C Ham
a
no
Do not show
.
ex
e
i
n
git
c
om
m
and list
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
Junio C Hamano
Cyg
w
in *mig
h
t
* be help
e
d
w
it
h
NO
_
MMAP
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
Junio C Hamano
git-pru
n
e: quote possi
b
ly empty $dryrun as parame
t
er
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
J
u
nio
C
Ham
a
no
g
it-a
m
: --bi
n
ary; docume
n
t --resume
a
n
d
--
b
i
n
ary
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
Juni
o
C Hamano
Deal with binary diff
o
ut
p
ut fr
o
m GNU diff 2
.
8
.
7
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
J
u
nio C
Hamano
M
e
rg
e
b
r
a
n
ch
'
to
j
unio' of
http://locke
.
catalyst
.
net
.
.
.
commit
|
commitdiff
|
tree
2005-11-17
Junio
C Hamano
Add approxidate te
s
t call
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
Ju
n
io C Hamano
te
s
ts: binary diff application
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
Junio C Hamano
diff: --full-index
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
Junio C Hama
n
o
apply:
a
llow-binary-
r
epl
a
cement
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
Junio
C
Hamano
git-am: --reso
l
ved
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-16
Ju
n
io C
H
amano
git-apply: fail if a
patch cannot
be appl
i
ed
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-16
Junio
C
Hama
n
o
git wr
a
p
p
e
r
:
b
asic fix
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
Juni
o
C
H
amano
sha1_file
.
c::a
d
d_pack
e
d_gi
t
(
): fix type mismatch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
Ju
n
io
C
H
am
a
no
diff: make default rename
d
etection limit co
n
figurable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
Junio C Hamano
Doc
u
mentati
o
n: do not blindly run 'cat'
.
git/HE
A
D,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
Ju
n
io C Hamano
Updat
e
topo-order test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
J
uni
o
C
H
a
man
o
a
p
ply: fix binary patch detec
t
ion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-14
J
unio C Hamano
Merge b
r
anch
'
svnup' of http
:
/
/
netz
.
smurf
.
noris
.
de
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-14
Junio C Hamano
S
eparate LDFLAGS and C
F
LAGS
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-14
Junio
C
Hamano
Mer
g
e br
a
nch 'sv
n
up' of http://netz
.
sm
u
rf
.
noris
.
d
e
.
.
.
commit
|
commitdiff
|
tree
2005-11-13
Junio C Ham
a
no
Rename
l
os
t
+found to lost-found
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-13
Junio
C Hamano
Debian:
b
u
ild-d
e
pend
o
n libexpat-
d
ev
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Hama
n
o
Ignor
e
b
u
i
lt git-l
o
st+found
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Hama
n
o
Documen
t
a
t
ion:
asciidoc sources are
utf-8
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C
H
a
m
ano
Re
n
ame
.
git/lost+found to
.
gi
t
/lost-found
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Haman
o
git-los
t
+found
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Jun
i
o C
Hamano
git-prune: prune
r
e
d
und
a
nt
p
ac
k
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio
C Ham
a
no
merge-o
n
e-file:
use empty-
o
r common
-
b
a
se condintionally
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio
C
Hama
n
o
D
ocum
e
n
t
ation: git-apply
-
-no-add
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Hamano
merge-
o
ne-fil
e
: use common as
b
a
s
e, in
s
tead of empt
i
ness
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C
H
amano
merge with /dev/null a
s
bas
e
, instead of
p
unti
n
g
O
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
J
unio C Ha
m
ano
I
NSTALL: duplicate
pyth
o
n requ
i
rements f
r
om
Makefile
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Ju
n
io C Haman
o
Me
r
ge bran
c
hes
'
jc/sb
'
a
n
d
'jc/mb'
commit
|
commitdiff
|
tree
2005-11-11
Juni
o
C Ham
a
no
t
1200: use --topo-order to keep
the
s
how-branch output
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
Fully detect
uninteresting
commits
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C
Hamano
gi
t
-show
-
branch: tigh
t
en merge-base computation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
Add tes
t
case for
mer
g
e
-base
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next