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
merge-recursive: match the unmerged index entry behaviour with merge-resolve
2005-11-30
Ju
n
io
C
Hamano
m
erge
-
recursive: mat
c
h
the unmer
g
ed index entr
y
behaviou
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
diff-files:
show diffs with stage0 and unmerged s
t
a
ge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Juni
o
C Ham
a
no
g
it-diff: do no
t
turn off -p/-M with a
n
y
d
iff opti
o
ns
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
ama
n
o
Merge h
t
tp://ww
w
.
kernel
.
o
r
g/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-29
J
uni
o
C
H
ama
n
o
write_name_quoted(): make
o
ne of the pa
t
h
a
c
ounted
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Hamano
Documentation: Desc
r
ibe merge operation a bit better
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o
C
Hama
n
o
name-rev: fix pa
r
ent
c
ounting
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
J
u
n
io C Hamano
rebase: one safety net, one bugfix and
one optimization
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Ju
n
io C Hamano
M
e
rge http://www
.
kernel
.
org/pub/s
c
m/gi
t
k
/gitk
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
git-mv:
quo
t
e $src in regexp properly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Ham
a
no
[PATCH] gitk: Us
e
i18n
.
co
m
mitencoding
c
o
nf
i
gurati
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio
C
Ha
m
ano
c
on
f
ig
.
c: constness tightenin
g
to avoid co
m
pilatio
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C
Ha
m
ano
mailinfo: Do not use -
u
=<
e
nc
o
ding>; say --e
n
codin
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio
C Hama
n
o
mai
l
info:
Use i
1
8n
.
commitenco
d
i
n
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Haman
o
ma
i
lin
f
o: allow
-
u to fall back
on
l
a
t
in1 to utf8 conversion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Ju
n
io C Haman
o
Introduce i
1
8n
.
co
m
mitencoding
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
M
erge http://
w
ww
.
ke
r
ne
l
.
org/pub/scm/
g
itk/gi
t
k
commit
|
commitdiff
|
tree
2005-11-27
J
unio C Ham
a
n
o
setup_
g
i
t_dir
e
ctory(): check
r
epository fo
r
mat ver
s
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Ha
m
ano
init-db: check template and repository
f
ormat
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
J
unio
C H
a
man
o
Check reposit
o
ry format version in en
t
er
_
repo()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Ha
m
ano
Reposit
o
ry format versio
n
check
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Junio
C
Hamano
format-patch: output
f
ilename reported
t
o std
o
u
t
verbatim
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Ju
n
io C H
a
mano
name-rev: fix off-by-one
e
rror
i
n -
-
stdin
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
J
u
n
io C Hamano
s
h
ell
.
c: co
m
plai
n
on
i
nsufficient a
r
gum
e
nts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Juni
o
C Hamano
git-sh-setup:
move the
r
eposit
o
ry che
c
k
to a core pro
g
ram
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hama
n
o
setup_git_directory
:
mak
e
sure
GIT_DIR is a va
l
id rep
o
sitory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
git-
v
ar: make it work in sub
d
irectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
J
u
n
io C H
a
mano
git-sh-
s
etup: die if outside git
r
e
p
ository
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
J
u
nio C Hamano
p
a
r
se-re
m
ote a
n
d
l
s
-r
e
mote cl
e
an-up
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Haman
o
Preven
t
"
g
it-com
m
it -a path1
p
a
th2
.
.
.
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
config
.
c
:
avoid sh
a
dowi
n
g gl
o
bal
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Junio
C
H
amano
di
f
f-
t
ree: teach single-c
o
mmit diff-tre
e
to
ho
n
our
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
J
u
nio C
H
amano
T
each update-in
d
ex to re
a
d from ls-t
r
ee
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Ju
n
io C Ham
a
no
git
-
r
e
v
ert: make --edit default
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Junio C
Ha
m
ano
git-m
e
r
g
e: make recursive the defaul
t
strategy
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Junio
C
Hamano
pack-red
u
ndant: type cl
e
anups
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
J
unio
C
H
amano
Me
r
ge http:/
/
www
.
k
ernel
.
org
/
pub/s
c
m/gitk
/
g
i
tk
commit
|
commitdiff
|
tree
2005-11-22
Junio C
H
amano
git-var
:
constness and
g
lo
b
aln
e
ss clea
n
up
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
Junio C H
a
m
a
no
Move diff
.
re
n
amelimit out of
d
e
fault configu
r
ation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Juni
o
C Hama
n
o
git-proxy upd
a
tes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Jun
i
o C Hamano
daemon: fu
r
t
h
er
tweaks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Junio
C
H
aman
o
tutori
a
l
:
s
etting up a tree for subsystem maintain
e
rs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Junio C Ham
a
no
rename detection
w
i
th -M
1
00 mea
n
s "exact renames only
"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
J
u
nio C Ha
m
ano
format-
p
atch: fix
t
wo
-
argument
speci
a
l case, and make
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Junio C Hamano
F
ix hooks/updat
e
template
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
J
unio C Hamano
Mak
e
sure heads/f
o
o a
n
d t
a
gs/foo do
n
ot confuse things
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Juni
o
C H
a
man
o
Fix "do not DWIM"
patch to
enter_repo"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Junio C Haman
o
Merge http://www
.
kernel
.
org
/
pub/scm/gitk/
g
itk
commit
|
commitdiff
|
tree
2005-11-20
Junio C Hamano
m
erge-o
n
e-file: use r
m
dir -p
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Junio C
H
amano
Do
c
ume
n
tation: add
h
o
oks/upd
a
te exampl
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Junio C
Hamano
Do not DWIM in userpath library under s
t
rict mod
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Junio C Ha
m
ano
h
ttp
.
c: reorder to
avoid com
p
ilation f
a
ilure
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Ju
n
io C
H
amano
merge-recu
r
s
ive::remove
F
i
l
e: remove em
p
ty directo
r
i
es
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Junio C Hamano
merge-one-f
i
le: remove empty di
r
ec
t
ories
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Junio C Hamano
Documentation: re
b
as
e
-from
-
in
t
e
r
nal minor u
p
dates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-19
Junio C Hama
n
o
git-repack:
do not do complex redund
a
ncy check
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-19
J
u
n
io C Hama
n
o
git-c
o
u
n
t-objec
t
s: dc replac
e
ment
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-19
Junio C Hamano
readrefs:
grab all refs with one c
a
ll to ls-remote
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-19
J
uni
o
C Hamano
Merge http
:
//www
.
k
e
rnel
.
org/pub/sc
m
/git
k
/
g
itk
commit
|
commitdiff
|
tree
2005-11-18
J
unio C Hamano
Merge branches 'jc/branch' and 'jc/r
e
b
a
se'
commit
|
commitdiff
|
tree
2005-11-18
Jun
i
o C H
a
mano
Rewrite rebase
t
o use git-fo
r
mat-patch piped to git-am
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
Jun
i
o C Hama
n
o
git-b
r
anc
h
: -f to forcibl
y
re
s
et branch head
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
Ju
n
io C Hama
n
o
Do not show
.
e
x
e
i
n git
c
ommand list
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
Juni
o
C Ha
m
ano
C
y
gwin
*
might* be hel
p
ed with NO_
M
MAP
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
Juni
o
C Haman
o
git
-
prune: quote pos
s
i
b
ly empty $dr
y
run as parameter
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
Junio C Hama
n
o
git-am: --binary; document
-
-re
s
u
m
e and --bi
n
ary
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-18
Junio C Hamano
Deal with binary diff output from
GNU di
f
f 2
.
8
.
7
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
Junio
C
Hamano
Merge branch 'toju
n
io' o
f
h
ttp://l
o
cke
.
catalyst
.
net
.
.
.
commit
|
commitdiff
|
tree
2005-11-17
Junio C Hamano
Add appr
o
x
i
d
a
te t
e
st calls
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
J
unio C Hamano
t
e
sts: binary diff ap
p
li
c
a
t
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
Junio C Hamano
diff: --fu
l
l
-
index
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
J
u
nio C Hamano
a
p
p
l
y
: allow-
b
in
a
r
y
-replaceme
n
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
Junio C H
a
mano
git-am:
--resolved
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-16
J
un
i
o C H
a
mano
git-appl
y
: fail if a patch cannot be applied
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-16
J
u
nio C
Ha
m
ano
git wra
p
pe
r
: ba
s
ic
f
ixes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
J
u
n
io C Hamano
sha1_
f
ile
.
c::add_packed_git(): fix type misma
t
ch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
Junio C Hamano
diff
:
make default
r
e
n
a
me d
e
t
e
ction limit configurable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
Ju
n
io
C
H
a
m
a
no
Documenta
t
ion
:
d
o
not
b
lindly
r
u
n 'cat'
.
g
it/
H
E
A
D,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
Junio C Hamano
U
pdate topo-order
test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
Junio C Hamano
ap
p
ly: fi
x
bin
a
ry patch d
e
tection
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-14
J
unio C Ha
m
an
o
Merge
b
ranch
'
svnup'
o
f http://netz
.
smurf
.
noris
.
d
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-14
Junio C Hamano
Separate LD
F
LAGS and CFLAGS
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-14
Junio
C Ha
m
ano
Merge br
a
nch 'svnup'
o
f h
t
tp://netz
.
sm
u
rf
.
nori
s
.
de
.
.
.
commit
|
commitdiff
|
tree
2005-11-13
Junio C H
a
m
a
n
o
Rename lost+found to
l
ost-found
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-13
Junio C Hamano
Debian: b
u
il
d
-de
p
end on lib
e
x
p
at-d
e
v
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C
Hamano
Ig
n
ore bui
l
t git-lost+fo
u
nd
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C
Haman
o
D
ocume
n
tation: asciidoc sources
are
u
tf-8
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C
Hamano
Rename
.
git/lost+foun
d
to
.
git/
l
ost
-
found
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C H
a
mano
git-lost+found
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C H
a
m
a
n
o
git-pru
n
e: prune
red
u
ndant pack
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
J
u
nio C
Hamano
merge-
o
ne-file: use empty- or common-base condintionally
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio
C Hamano
Documen
t
ation: git-ap
p
ly --no-a
d
d
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Ju
n
io C Hamano
merge
-
one-file:
u
s
e
co
m
mon a
s
base
,
i
nstead of em
p
tine
s
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C H
a
mano
merge with /dev/nu
l
l as base, inste
a
d
o
f
p
unting O
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
J
u
n
io
C
Haman
o
INSTALL: d
u
plicate python req
u
irem
e
nts
from Makefi
l
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
J
u
n
io C Hamano
Merge branches 'jc/sb' and 'jc
/
mb'
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
t1200:
u
se --topo-order to keep the
s
h
o
w-
b
ran
c
h outpu
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Ju
n
i
o C
Ham
a
no
Fully
detect unintere
s
t
i
ng
commits
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Jun
i
o
C Haman
o
g
i
t
-show-branch: tighten merge-ba
s
e compu
t
ati
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
A
d
d test c
a
se for merg
e
-base
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next