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
Junio C Hamano
M
e
rgetool gene
r
ating
b
lan
k
f
i
l
es (1
.
5
.
3)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-25
Junio
C
Hamano
Merge branch 'jn/web' int
o
maint
commit
|
commitdiff
|
tree
2007-09-24
Junio
C
Haman
o
Merge branch
'm
a
int' of git://linux-nfs
.
org
/
~bfi
e
lds
.
.
.
commit
|
commitdiff
|
tree
2007-09-21
Junio C Hamano
D
o
c
u
mentation/git-lost-found
.
txt: drop unn
e
cessarily
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-19
Junio C Ham
a
no
G
I
T
1
.
5
.
3
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-18
Junio C Hamano
t/t
4
014:
t
e
s
t
"a
m
-
3" with mode-
o
nly cha
n
g
e
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-18
Junio
C Ha
m
a
n
o
Document l
s
-files --wit
h
-tre
e
=<tree-ish>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-18
Jun
i
o C Hama
n
o
git-commit: part
i
al comm
i
t of paths onl
y
removed from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-18
Jun
i
o C Hamano
git-commit: Al
l
ow partial commit of fil
e
r
e
moval
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-18
Ju
n
i
o
C
Hamano
Merge b
r
anch 'jc/
g
rep-c' into
m
aint
commit
|
commitdiff
|
tree
2007-09-18
Juni
o
C Ha
m
ano
M
e
r
ge branch 'm
a
i
n
t' of git:
/
/repo
.
or
.
cz/git-gui i
n
to
.
.
.
commit
|
commitdiff
|
tree
2007-09-18
J
unio C Hamano
se
n
d-
e
mail: make messag
e
-id g
e
ne
r
a
tio
n
a
b
it m
o
r
e robust
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-16
Jun
i
o C
H
amano
Merge bran
c
h '
m
aint' of
g
it://
l
inu
x
-nfs
.
org/~b
f
ields
.
.
.
commit
|
commitdiff
|
tree
2007-09-15
Junio C Hamano
git-sh
-
setup: typofix in comme
n
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-14
Junio
C
Hamano
Split gre
p
argumen
t
s in
a
w
a
y
t
h
a
t do
e
s not requi
r
es
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-14
Junio C
H
am
a
n
o
Documen
t
ation/git-con
f
ig
.
txt
:
As
c
i
i
Doc tweak to av
o
id
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-14
Junio
C
Hamano
d
iff --no-inde
x
: do
n
o
t forget
t
o run dif
f
_set
u
p_done()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-14
Junio C Ha
m
ano
git
-
f
ormat-patc
h
--in-re
p
l
y
-to:
a
c
cept <message@id
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-14
Jun
i
o C Ham
a
no
g
i
t-add
-u:
do
no
t
barf on
type change
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-12
Junio
C
H
amano
Merge
b
ran
c
h 'sp/maint-no-thi
n
' into
m
ai
n
t
commit
|
commitdiff
|
tree
2007-09-06
Junio C Hamano
gi
t
-apply: do
n
ot read p
a
st the end of buffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-03
Juni
o
C Ha
m
ano
GIT 1
.
5
.
3
.
1:
obsolete
git
-
p4 in
R
PM spec fil
e
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-02
Junio C Haman
o
Typofix: 1
.
5
.
3
release notes
commit
|
commitdiff
|
tree
2007-09-02
Junio C H
a
man
o
GIT 1
.
5
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-01
Juni
o
C Hamano
Mer
g
e branch
'jp/se
n
d
-
ema
i
l-cc'
commit
|
commitdiff
|
tree
2007-09-01
Jun
i
o
C Hamano
U
pda
t
e my contact address as t
h
e maintainer
.
commit
|
commitdiff
|
tree
2007-09-01
Junio C
Hamano
Docum
e
ntat
i
on: minor AsciiDoc mark-up fixes
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-01
Junio C Hamano
Avoid one-or-mo
r
e
(
\
+) non BRE in se
d
scripts
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-01
Junio C Ha
m
ano
git-diff: resurrect the
t
radition
a
l
emp
t
y "
d
i
ff --
g
it
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-01
Junio C
Haman
o
g
it-svn:
P
rotect
a
g
a
inst
"
d
i
ff
.
color = true
"
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-31
Jun
i
o C Hamano
Hop
e
full
y
the
fin
a
l update to draft release notes for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-31
J
unio
C
Hamano
Make
"
git-log
--" without paths
b
ehave the same as
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-31
Junio C Hamano
git-init
:
a
u
todetect cor
e
.
symlin
k
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-31
Junio C Hama
n
o
filt
e
r
-branch: make s
u
r
e
orig_na
m
e
sp
a
ce ends
w
ith a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-31
Juni
o
C Hamano
Makefile
:
do
not allow gnu make to remove test-*
.
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-30
Junio C Hamano
ls-fil
e
s --error-unmatch: do not barf i
f
t
h
e s
a
me pattern
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-29
Junio C Haman
o
Merge branch 'm
a
ster' of git://
g
it
.
k
ernel
.
org/pub/scm
.
.
.
commit
|
commitdiff
|
tree
2007-08-29
J
unio C Hamano
g
it-d
a
emon(1): assorted
improvements
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-29
Junio C Hamano
GIT 1
.
5
.
3
-rc7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-29
Jun
i
o
C Hamano
format-patch documentati
o
n
: reword to hint
"
--roo
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-29
Junio C
H
a
mano
Merge
branch 'jc/logsem
a
ntics'
commit
|
commitdiff
|
tree
2007-08-29
Ju
n
i
o
C Hamano
D
ocumentation/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 Hamano
"format-pa
t
ch
--
r
oot rev" is
the w
a
y
t
o sho
w
everything
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-28
Junio C Hamano
Porcelai
n
leve
l
"log"
family should recurse when diffi
n
g
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-28
Junio C Haman
o
git-merge:
d
o up-to-date ch
e
ck also for all s
t
rat
e
g
i
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-28
J
u
nio C
Hamano
git --
b
are cm
d
:
do not uncondi
t
ionally
n
u
k
e
GIT_
D
IR
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-28
Juni
o
C
Hama
n
o
Fix initializa
t
ion of a bare rep
o
sitory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-27
Ju
n
io C
H
amano
Rel
N
otes draft
f
o
r 1
.
5
.
3
update
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-27
Ju
n
io C Hamano
M
erge branch 'master' of
g
i
t://r
e
po
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2007-08-26
Junio C Ham
a
no
Me
r
ge
branch
'
master
'
o
f
git://
l
inux-n
f
s
.
o
rg/~b
f
ields/git
commit
|
commitdiff
|
tree
2007-08-25
Junio C Hamano
pack-o
b
ject
s
: check r
e
turn valu
e
fr
o
m rea
d
_sha1_file()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-25
J
u
nio C H
a
man
o
bla
m
e
:
check
r
e
turn value from re
a
d_sha1_file()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-23
Junio C
H
ama
n
o
Merge bra
n
ch
'
m
aster' of git:/
/
repo
.
or
.
c
z/g
i
t/fastimport
commit
|
commitdiff
|
tree
2007-08-21
Junio C
H
amano
GIT 1
.
5
.
3-rc6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-21
Junio C Hamano
M
e
rge br
a
n
ch 'master' of gi
t
:
/
/git
.
kernel
.
org/pub/scm
.
.
.
commit
|
commitdiff
|
tree
2007-08-20
Junio C
Ha
m
ano
git clone: do not issue warning
w
hile clon
i
ng
l
ocally
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-19
Junio
C
Hamano
M
e
rge
b
ranch 'mast
e
r' of git:
/
/
r
e
po
.
or
.
cz/
g
it-gui
commit
|
commitdiff
|
tree
2007-08-19
J
u
nio C Ham
a
no
Merge branch 'm
a
ster'
o
f
g
i
t
://git
.
kernel
.
org/
p
ub/scm
.
.
.
commit
|
commitdiff
|
tree
2007-08-19
Junio C
H
ama
n
o
fast-import pull request
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-17
Junio C Hamano
C
lean-up read-tree erro
r
condi
t
ion
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-16
Jun
i
o C Hamano
Documentation/gi
t
-
r
ebase: f
i
x
a
n
example
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-16
Juni
o
C
Ham
a
no
git-clone: a
l
low -
-
bare clon
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-16
Jun
i
o C Hamano
Update
d
ocumentation links
for older releas
e
s
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-16
Jun
i
o C Ham
a
no
Me
r
ge branch 'ma
i
nt
'
to sync with 1
.
5
.
2
.
5
commit
|
commitdiff
|
tree
2007-08-16
J
un
i
o C Hamano
Fix read-
t
ree m
e
rg
i
n
g
more than 3 tree
s
us
i
ng 3-
w
ay
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-15
Junio C Hamano
G
IT 1
.
5
.
2
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-15
Junio C Hamano
F
i
x "
g
it add -
u
" d
a
ta corruption
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-15
Junio C H
a
mano
GIT 1
.
5
.
3-rc5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-15
Junio C Hama
n
o
attr
.
c: read
.
gitattr
i
butes from index as well
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-15
Ju
n
io C Hamano
attr
.
c: refactoring
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-15
Junio C Hamano
m
erge-recursive: do not rudely die on binary m
e
rge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-14
Junio C Ham
a
no
git-di
f
f: s
q
u
e
lch "empty" diffs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-13
Junio
C
Ha
m
ano
builtin-bu
n
d
l
e create - use
loc
k
_file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-13
Ju
n
i
o
C Hama
n
o
t3404: f
i
x "
f
ake-editor"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-13
Ju
n
io C
Hamano
M
e
rge branch 'master' of git://git
.
kernel
.
org
/
pub/scm
.
.
.
commit
|
commitdiff
|
tree
2007-08-11
Jun
i
o
C H
a
mano
Merge bran
c
h 'cr/tag'
commit
|
commitdiff
|
tree
2007-08-11
J
u
nio C Hamano
Merge branch 'jc/clone'
commit
|
commitdiff
|
tree
2007-08-11
Junio C Hamano
a
llow git-b
u
ndle to c
r
e
a
te
bottomless bundle
>
Junio C Hamano
wrote:
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-11
J
u
nio
C Hamano
all
o
w git-bundle to create
bo
t
tom
l
ess bundle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-10
Jun
i
o
C
H
am
a
no
M
e
r
g
e
b
r
anch 'lt/
r
eadt
r
ee'
commit
|
commitdiff
|
tree
2007-08-10
Junio C
H
amano
Optimize
"
diff --cac
h
ed" perfo
r
m
ance
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-10
J
unio C Haman
o
Revert "
t
weak m
a
npage form
a
t
ting
"
commit
|
commitdiff
|
tree
2007-08-10
Jun
i
o
C
Hamano
tweak man
p
age fo
r
matting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-10
J
unio C Ham
a
no
Fix an
illustrat
i
on i
n
g
it-rev-p
a
rse
.
txt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-10
J
u
nio C Hamano
Fix
for
m
atting
o
f
git-blam
e
d
ocumentatio
n
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-08
Junio C Hamano
Reorder the
list of commands in t
h
e
m
anual
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-07
Junio C
Hamano
Fi
x
"make GZ=1 qu
i
ck-
i
nsta
l
l-doc"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-07
Jun
i
o
C
Hamano
pager: find out pa
g
er
setti
n
g from c
o
nfigurati
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-06
Junio C Hamano
Mer
g
e b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-08-06
Junio C Haman
o
setup
.
c
:
ver
i
fy_non_filename(): don't die unne
c
essarily
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-06
Junio C Hamano
Merge
b
r
anch 'ma
s
ter'
o
f gi
t
://linux-nfs
.
org/~bfiel
d
s/git
commit
|
commitdiff
|
tree
2007-08-05
Junio
C
Ham
a
no
u
s
e
r
-
manual
:
men
t
ion git st
a
sh
commit
|
commitdiff
|
tree
2007-08-05
Junio C Hamano
Fix in
s
tall-doc-quic
k
target
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-05
Juni
o
C Ham
a
no
unpack-trees
.
c:
ass
u
m
e submodules are
c
l
ean
during
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-04
Junio C Hamano
INST
A
LL: a
d
d
warning on docbook-
x
sl 1
.
72 and 1
.
73
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-04
Juni
o
C
H
amano
git-completion
:
add "
g
it stash"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-03
Ju
n
io
C H
a
m
a
no
G
I
T 1
.
5
.
3-rc
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-03
Junio C Hamano
Fix
b
o
g
us
use of printf in t3700
te
s
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-03
Junio C Hamano
gitweb: do
not choke on r
e
c
ursi
v
e
s
ymlink
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-03
Junio C Hama
n
o
F
i
x work-tree related breakages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next