repo.or.cz
/
git
/
mergetool.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
mergetool: Fix typo in options passed to kdiff3
2007-09-29
Juni
o
C Ha
m
ano
Merget
o
o
l
g
e
ner
a
ting b
l
an
k
fil
e
s (1
.
5
.
3)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-25
Ju
n
io C
Hama
n
o
Mer
g
e branch
'
j
n
/web
'
into
maint
commit
|
commitdiff
|
tree
2007-09-24
Junio C Haman
o
Me
r
ge branch 'maint' of git://lin
u
x-nfs
.
o
r
g/~bfields
.
.
.
commit
|
commitdiff
|
tree
2007-09-21
Junio C Hamano
Documen
t
ation
/
git-lost-found
.
tx
t
:
drop unnecessar
i
ly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-19
Ju
n
io C Hama
n
o
GIT 1
.
5
.
3
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-18
Jun
i
o
C Haman
o
t/
t
40
1
4: test "
a
m -
3
" with mode-only change
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-18
Junio C Hamano
Docum
e
n
t ls-fi
l
es --wi
t
h-tree=<tr
e
e-ish>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-18
Junio C
Hama
n
o
git-commit: partia
l
commit o
f
pa
t
hs onl
y
remo
v
e
d fro
m
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-18
Junio C
H
amano
git-commit:
Al
l
ow partial commi
t
o
f file removal
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-18
J
unio C Hama
n
o
M
e
rge
br
a
nc
h
'
j
c/g
r
ep-c'
i
n
t
o
ma
i
nt
commit
|
commitdiff
|
tree
2007-09-18
Juni
o
C
Hamano
M
e
rge bran
c
h 'main
t
' of git://repo
.
or
.
cz/git-
g
ui
into
.
.
.
commit
|
commitdiff
|
tree
2007-09-18
Junio C Hamano
se
n
d-e
m
a
i
l
:
m
a
k
e
message-id generation
a bit
more robust
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-16
Junio C Hamano
Merge branch 'maint'
of git://
l
inux-nfs
.
org/~bfiel
d
s
.
.
.
commit
|
commitdiff
|
tree
2007-09-15
Jun
i
o C H
a
mano
git-s
h
-
s
etu
p
: typofix in comments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-14
Junio C H
a
m
a
n
o
Split g
r
e
p
argu
m
ents in a way that does not requires
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-14
Jun
i
o C Ham
a
no
Docume
n
tation/git-
c
onfig
.
t
xt: Asc
i
iDoc tweak to a
v
oid
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-14
Junio C Ha
m
a
no
diff --no-
i
nd
e
x
:
do n
o
t forget to r
u
n d
i
ff_setup_
d
one()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-14
Junio C Hamano
git-format-p
a
tch --in
-
r
epl
y
-to: accept <message@id
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-14
Junio
C H
a
mano
git-add -u: do
not barf o
n
type ch
a
nges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-12
Junio C Haman
o
Merge branch
'
sp/maint-no-thi
n
' into maint
commit
|
commitdiff
|
tree
2007-09-06
Junio C Hamano
git-apply
:
d
o
not read
p
ast the end of buffe
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-03
Junio C Ha
m
ano
GIT 1
.
5
.
3
.
1: obsolete git-p4 in
RPM spec file
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-02
J
u
nio C Hama
n
o
Typofix:
1
.
5
.
3 releas
e
notes
commit
|
commitdiff
|
tree
2007-09-02
Jun
i
o C Ham
a
n
o
GIT 1
.
5
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-01
Junio
C
H
a
ma
n
o
M
e
rge branch 'jp
/
send-email-cc'
commit
|
commitdiff
|
tree
2007-09-01
J
unio C
H
a
m
ano
Update my contact add
r
ess as the mai
n
t
a
iner
.
commit
|
commitdiff
|
tree
2007-09-01
J
u
nio C Hamano
Documentation: minor Asc
i
i
Doc
m
a
rk-up fixes
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-01
Junio C
Hamano
Avoid
o
ne
-
or-more (\+)
n
on BRE i
n
s
ed scripts
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-01
J
u
nio C Ham
a
no
gi
t
-diff
:
re
s
urre
c
t the traditi
o
n
al em
p
ty "diff
-
-git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-01
J
u
n
i
o C Hamano
git-svn: Protec
t
agains
t
"diff
.
color
=
true
"
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-31
Junio C
H
am
a
no
Hopefu
l
ly
t
he final
u
pd
a
te to draft release notes for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-31
Juni
o
C H
a
ma
n
o
Make "git-log --" wi
t
ho
u
t
path
s
behave
t
he
s
ame a
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-31
J
unio C
Hama
n
o
git-init: autodete
c
t core
.
sy
m
l
inks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-31
Junio C
Hamano
filter-branch: make su
r
e
or
i
g_namespace
en
d
s with a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-31
Junio
C H
a
m
a
no
Mak
e
f
ile
:
do no
t
allow gn
u
make to remove test-*
.
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-30
Junio C Ha
m
a
n
o
ls-files --
e
rror-
u
nmatch: do n
o
t barf if th
e
s
ame pat
t
ern
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-29
Ju
n
i
o
C Ha
m
ano
Merge branch '
m
aster' of
g
it://git
.
kerne
l
.
or
g
/pub/
s
cm
.
.
.
commit
|
commitdiff
|
tree
2007-08-29
Junio C Hamano
gi
t
-d
a
e
m
on(1):
a
ssort
e
d
imp
r
ovements
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-29
Junio C Hamano
GIT 1
.
5
.
3
-
r
c
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-29
J
u
nio C Ha
m
ano
format-pat
c
h
d
ocumentation:
r
ewor
d
to
hi
n
t "--root
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-29
Junio C Hama
n
o
M
erg
e
b
r
anch 'jc/logsema
n
tics'
commit
|
commitdiff
|
tree
2007-08-29
J
u
nio C Hama
n
o
Docum
e
ntat
i
on/git-diff:
A
.
.
B and
A
.
.
.
B cannot take
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-28
Junio C Hama
n
o
"format-patch --root rev" is the way to show everything
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-28
Junio C Haman
o
Porcela
i
n level "log" famil
y
should recurs
e
whe
n
diffing
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-28
J
u
nio C H
a
mano
git-merge: do up-to-date check als
o
for a
l
l strategies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-28
Ju
n
i
o
C Hamano
git
--
b
are cmd: do not un
c
onditi
o
nally
n
u
k
e GIT_DIR
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-28
Junio C Hamano
Fix i
n
itialization of a b
a
r
e
reposit
o
ry
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-27
Junio C
H
a
m
ano
Rel
N
otes dra
f
t for 1
.
5
.
3
u
p
date
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-27
Junio
C
Hamano
Merge b
r
anch 'maste
r
' of git://
r
epo
.
or
.
c
z/git-gui
commit
|
commitdiff
|
tree
2007-08-26
Jun
i
o C
H
amano
Mer
g
e bran
c
h
'mast
e
r' of git
:
//linu
x
-nfs
.
org/~bfields/git
commit
|
commitdiff
|
tree
2007-08-25
Ju
n
io C Ha
m
a
n
o
pack-obj
e
cts: check
return
v
alue from rea
d
_sha1_file()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-25
J
unio
C
Hamano
blame:
c
heck r
e
turn
va
l
ue
f
rom
r
ead_sha
1
_
fil
e
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-23
J
u
nio C H
a
ma
n
o
M
erge branch 'maste
r
' of
git
:
//repo
.
or
.
cz/gi
t
/fastimp
o
r
t
commit
|
commitdiff
|
tree
2007-08-21
Junio C Haman
o
GIT 1
.
5
.
3-rc6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-21
Junio C Hamano
Mer
g
e br
a
nch 'master' o
f
git://git
.
ker
n
e
l
.
org/pub/scm
.
.
.
commit
|
commitdiff
|
tree
2007-08-20
Ju
n
io C Hamano
git
c
lo
n
e
:
d
o not
issue warn
i
ng while cloning
l
oc
a
lly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-19
Junio
C Hamano
Merge
branch 'm
a
ste
r
' of git:/
/
repo
.
or
.
c
z/git-gui
commit
|
commitdiff
|
tree
2007-08-19
Junio C H
a
mano
Merge branch 'master' of git://git
.
kernel
.
org/pub/
s
cm
.
.
.
commit
|
commitdiff
|
tree
2007-08-19
Junio
C
H
amano
fast-imp
o
r
t
pull request
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-17
Junio C Hamano
Clea
n
-
u
p read-tr
e
e error co
n
dition
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-16
Juni
o
C Haman
o
Do
c
umentation/git-
r
ebase:
f
i
x an e
x
a
m
pl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-16
Junio C Hamano
git-
c
l
o
ne: allow --bare clone
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-16
Junio C Hamano
Update d
o
cumentat
i
on l
i
nk
s
for older
r
eleases
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-16
Junio C
H
amano
Merge bra
n
c
h
'
ma
i
nt' to sync with 1
.
5
.
2
.
5
commit
|
commitdiff
|
tree
2007-08-16
Junio C Hamano
F
i
x read
-
tr
e
e merging
more
than
3 trees u
s
i
ng 3-
w
ay
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-15
Junio
C Hamano
GIT 1
.
5
.
2
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-15
Junio C Ha
m
a
no
Fix "git add -u" data cor
r
uption
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-15
Junio C H
a
mano
G
I
T 1
.
5
.
3
-
rc5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-15
Ju
n
io C Hamano
attr
.
c
:
read
.
gitattrib
u
t
e
s
f
rom inde
x
as wel
l
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-15
Junio
C
H
a
mano
attr
.
c:
refact
o
r
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-15
Ju
n
i
o C Hamano
me
r
ge-recursive: do
not rudely di
e
o
n
b
i
n
a
r
y
merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-14
Junio C Haman
o
git-dif
f
: squelch "empty" diffs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-13
Junio C H
a
mano
builtin-
b
u
n
dle create - use loc
k
_file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-13
J
u
n
io C H
a
mano
t3404: fi
x
"fake-edit
o
r
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-13
Ju
n
io C H
a
mano
M
erg
e
branch '
m
as
t
er'
of git://git
.
kernel
.
org/pub/scm
.
.
.
commit
|
commitdiff
|
tree
2007-08-11
Jun
i
o
C
Hamano
Merge b
r
anch
'cr/tag
'
commit
|
commitdiff
|
tree
2007-08-11
Junio C Hamano
Merge br
a
nch '
j
c/clone'
commit
|
commitdiff
|
tree
2007-08-11
J
unio C
Hamano
allow git-bun
d
le to create bottomless bundle
>
Junio C Hamano
wrote:
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-11
Juni
o
C
H
a
mano
all
o
w
gi
t
-bundle to
c
reate bottom
l
ess bu
n
dle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-10
Juni
o
C Ham
a
no
Merge b
r
anch 'lt/r
e
a
d
tr
e
e'
commit
|
commitdiff
|
tree
2007-08-10
J
unio
C Hamano
O
ptimize "diff --
c
ached" performance
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-10
J
u
nio
C Haman
o
Revert "tweak manpa
g
e
form
a
tti
n
g"
commit
|
commitdiff
|
tree
2007-08-10
Junio C Hamano
tweak manpage formatting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-10
Junio C Hamano
Fix an
i
ll
u
strat
i
on in git-rev-parse
.
t
xt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-10
Junio C Hamano
Fix form
a
tting of git-blame
d
ocumentation
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-08
Junio C H
a
mano
Reorder the list of comm
a
nds in the
manual
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-07
Junio C Haman
o
Fix "make G
Z
=1 quick
-
install-doc"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-07
J
u
nio
C Ha
m
ano
pager: find
o
ut
p
ager
setting from con
f
iguration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-06
Junio
C Hamano
Merge b
r
a
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-08-06
Juni
o
C Ham
a
no
setup
.
c:verif
y
_
non_filename(): don't di
e
unnecessarily
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-06
Junio C Haman
o
M
e
rge
branch 'mast
e
r' of git:
/
/linux-
n
fs
.
org/~
b
fields/git
commit
|
commitdiff
|
tree
2007-08-05
Ju
n
io
C
Hamano
u
s
er-manual
:
me
n
tion git stash
commit
|
commitdiff
|
tree
2007-08-05
Jun
i
o C Hamano
Fix install-do
c
-quick
target
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-05
Jun
i
o C
Hamano
unpack
-
trees
.
c:
a
ssume
s
ubmodules are
cle
a
n
dur
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-04
Junio C H
a
mano
INST
A
LL:
add wa
r
n
i
ng on docbook-xsl 1
.
7
2
and 1
.
73
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-04
Junio C Hamano
git-completion: add
"
git
stash
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-03
Junio C Hama
n
o
G
IT 1
.
5
.
3
-
r
c
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-03
Junio
C
Hamano
Fix bogus use
of prin
t
f in
t37
0
0 test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-03
Junio
C
Hamano
gitweb: do not choke on recursive sy
m
l
i
nk
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-03
Junio
C
Ha
m
ano
Fix w
o
rk-t
r
ee rela
t
e
d
br
e
akag
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next