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
Haman
o
Me
r
g
etool generating blan
k
fi
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
ma
i
nt
commit
|
commitdiff
|
tree
2007-09-24
J
un
i
o C Hamano
Me
r
g
e
b
r
a
nch 'ma
i
nt' of git://linux-nfs
.
org/~bfields
.
.
.
commit
|
commitdiff
|
tree
2007-09-21
J
u
nio C
Hamano
Do
c
umenta
t
ion/git-
l
ost-f
o
u
nd
.
t
x
t: drop unneces
s
ar
i
ly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-19
Junio C Hamano
GIT 1
.
5
.
3
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-18
J
unio C Ham
a
no
t
/
t4014: test "am -3" with
m
ode-only change
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-18
Junio C Hamano
D
o
cume
n
t
ls-files --with-tree=
<
tre
e
-ish>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-18
J
u
nio C Haman
o
g
it-comm
i
t: partial
com
m
it of pa
t
hs onl
y
removed f
r
om
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-18
Junio C Hamano
g
it-commit: Allow partial com
m
i
t of f
i
le removal
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-18
Junio C Hamano
M
erge branch '
j
c/grep-c'
i
nto
m
ain
t
commit
|
commitdiff
|
tree
2007-09-18
Junio C Ham
a
n
o
Merge br
a
nch 'maint' o
f
git://repo
.
or
.
cz/gi
t
-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-09-18
Junio C Hamano
se
n
d-email: ma
k
e mes
s
ag
e
-id generation a
b
it mo
r
e rob
u
st
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-16
Jun
i
o C Hamano
M
e
rge bran
c
h
'
maint'
of git://linux-nfs
.
org/~bfields
.
.
.
commit
|
commitdiff
|
tree
2007-09-15
J
u
n
io C Hamano
git-
s
h-
s
etup: typofix in comments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-14
Junio C Hamano
Split grep
arguments in a way th
a
t
does not r
e
quires
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-14
J
unio C
H
amano
Docu
m
enta
t
i
on/git-conf
i
g
.
txt: A
s
c
iiDoc
t
we
a
k
to avoid
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-14
Ju
n
io C Ha
m
a
no
diff --no-in
d
ex: d
o
not
f
orget
to run
diff_set
u
p_don
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-14
J
u
nio C
H
ama
n
o
git-fo
r
ma
t
-pa
t
ch --
i
n-reply-t
o
: accept <
m
essage@id
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-14
Junio C Hamano
gi
t
-add -u: do
n
o
t
barf on ty
p
e changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-12
Ju
n
i
o C Hama
n
o
Merge
b
ra
n
ch
'
s
p/
m
aint-no
-
t
h
i
n' into
m
aint
commit
|
commitdiff
|
tree
2007-09-06
Junio C Haman
o
gi
t
-appl
y
: do not read
p
ast
t
he end of
buffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-03
Ju
n
io C Hamano
GIT 1
.
5
.
3
.
1
:
obsolete g
i
t-p4 in
RPM spec file
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-02
Junio C Ha
m
ano
Ty
p
o
f
ix: 1
.
5
.
3 release
n
ote
s
commit
|
commitdiff
|
tree
2007-09-02
Junio C
H
amano
G
I
T
1
.
5
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-01
Junio C Hamano
Mer
g
e branch '
j
p
/send-email-cc'
commit
|
commitdiff
|
tree
2007-09-01
Juni
o
C Ha
m
ano
Update my con
t
act address as the maintainer
.
commit
|
commitdiff
|
tree
2007-09-01
Junio C Hamano
Docume
n
tat
i
o
n
: minor
A
sciiDoc mark-u
p
f
ixes
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-01
Jun
i
o
C
Hama
n
o
Avoid one-or-more (\+) non BRE in sed sc
r
i
p
ts
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-01
Jun
i
o C Hamano
git-diff: resur
r
ect the tradit
i
onal empt
y
"diff -
-
git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-09-01
Ju
n
i
o
C Ham
a
n
o
git-svn: Prot
e
ct against "
d
i
ff
.
color
= true"
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-31
Junio C Ha
m
a
n
o
Hopefully the final upd
a
te
to
d
raft release notes for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-31
Junio C Hamano
Make "git-log --"
without p
a
ths behav
e
the same
a
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-31
Junio C H
a
mano
gi
t
-init: auto
d
e
t
e
ct core
.
sym
l
inks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-31
Junio C Hamano
filter-
b
ranch: make
sure orig_n
a
mes
p
ace
e
nds wi
t
h a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-31
Junio
C Hamano
M
a
k
e
file: d
o
no
t
a
l
low
gn
u
m
ake
to remove tes
t
-*
.
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-30
J
u
n
i
o C
Hamano
ls-files --err
o
r-unmatch:
d
o n
o
t barf if the
s
am
e
pattern
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-29
J
unio C Hamano
M
e
rge branch '
m
aster' of
g
it
:
//git
.
kern
e
l
.
org/pub/sc
m
.
.
.
commit
|
commitdiff
|
tree
2007-08-29
J
u
n
i
o C Haman
o
git-da
e
m
on(1)
:
asso
r
te
d
impr
o
vem
e
n
t
s
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-29
Junio C Ha
m
ano
G
IT 1
.
5
.
3-rc
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-29
Junio C Hamano
format-pa
t
ch d
o
cum
e
ntatio
n
: reword to hint
"--root
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-29
J
u
nio C Hamano
M
erge branch 'j
c
/logsema
n
tics'
commit
|
commitdiff
|
tree
2007-08-29
J
u
ni
o
C Hamano
D
ocu
m
entation/git-diff: A
.
.
B and A
.
.
.
B c
a
nnot t
a
ke
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-28
Junio C Hamano
"
format-patc
h
--root rev" is
the w
a
y to show ev
e
rything
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-28
Juni
o
C
Hamano
Porce
l
a
i
n
l
e
v
el
"
log" fa
m
i
l
y
should
recur
s
e when diffing
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-28
J
unio C H
a
mano
git-merge:
d
o up-to-d
a
te check
also for all strategies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-28
Junio C
Haman
o
gi
t
--ba
r
e cmd: do not un
c
onditional
l
y nuke GIT_DIR
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-28
Junio
C
H
amano
Fix ini
t
iali
z
ation of
a
b
are
r
epository
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-27
Junio C Hama
n
o
R
elNotes
d
raft for
1
.
5
.
3
update
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-27
Junio C
Hamano
Merge b
r
anch 'mas
t
er' of git
:
/
/
repo
.
or
.
cz/git
-
gui
commit
|
commitdiff
|
tree
2007-08-26
Junio C
Hama
n
o
Merge branch '
m
aster' of git://linux-
n
fs
.
or
g
/~bfields/git
commit
|
commitdiff
|
tree
2007-08-25
Junio C Hama
n
o
pack-objects
:
c
hec
k
return value from read_sha1_file
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-25
Junio
C H
a
mano
blame: check return value from read_s
h
a1
_
file()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-23
Junio C
Hamano
Merge branch 'mast
e
r' of
git://repo
.
or
.
cz/git/fas
t
import
commit
|
commitdiff
|
tree
2007-08-21
J
u
nio C Hamano
G
I
T
1
.
5
.
3-
r
c
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-21
Junio C
H
ama
n
o
M
erge bran
c
h 'mas
t
er' of gi
t
://gi
t
.
kernel
.
o
r
g
/p
u
b
/
scm
.
.
.
commit
|
commitdiff
|
tree
2007-08-20
Jun
i
o C Ham
a
no
git cl
o
ne: do not iss
u
e w
a
rni
n
g
while
c
loning
lo
c
ally
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-19
Junio C Ha
m
ano
Merge bran
c
h 'ma
s
ter'
of
g
it://rep
o
.
or
.
c
z/
g
i
t-gui
commit
|
commitdiff
|
tree
2007-08-19
Junio C H
a
m
a
no
Merge bran
c
h
'master' of
g
it://
g
it
.
kernel
.
org/pu
b
/scm
.
.
.
commit
|
commitdiff
|
tree
2007-08-19
Junio C Hamano
f
ast-im
p
ort
pull request
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-17
Junio C Hamano
C
l
ean-up read-tree err
o
r condition
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-16
Junio C
H
amano
Do
c
u
me
n
tation/git-rebase:
f
ix an example
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-16
Junio C Hamano
git
-
clone: allow --bare clone
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-16
Jun
i
o C
H
a
mano
Update do
c
umentation links for older
release
s
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-16
Junio C Ham
a
no
Merge
branch 'mai
n
t
'
to syn
c
with 1
.
5
.
2
.
5
commit
|
commitdiff
|
tree
2007-08-16
Junio C Hamano
Fix read
-
tree merging
more than 3 tre
e
s u
s
ing 3-way
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-15
Junio C
H
amano
GIT 1
.
5
.
2
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-15
Junio C Ham
a
n
o
Fix "
g
i
t
add -u" data corruption
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-15
Jun
i
o C Hamano
GIT 1
.
5
.
3-rc5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-15
Junio C Hamano
attr
.
c: read
.
gi
t
attributes from i
n
dex as well
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-15
Junio
C Ham
a
n
o
attr
.
c: r
e
fact
o
ri
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-15
Juni
o
C
Hamano
merge-recu
r
s
i
ve: d
o
not rudely die on binary merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-14
Junio C Hamano
gi
t
-
d
iff: sque
l
c
h
"empty
"
diffs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-13
Junio
C Hamano
builtin-bund
l
e create
- use lock_file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-13
Junio
C H
a
m
a
no
t3404: f
i
x
"f
a
ke
-
e
d
itor"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-13
Junio C Hamano
Merge branc
h
'm
a
ster'
o
f git://
g
it
.
kernel
.
org/p
u
b
/scm
.
.
.
commit
|
commitdiff
|
tree
2007-08-11
Junio C H
a
mano
M
erge branc
h
'cr/t
a
g
'
commit
|
commitdiff
|
tree
2007-08-11
Junio C
H
amano
Merge bran
c
h 'jc/c
l
one'
commit
|
commitdiff
|
tree
2007-08-11
Junio C H
a
m
a
n
o
al
l
ow git
-
b
u
ndle to cr
e
ate bottomless bundle
>
Junio C Hamano
wrote:
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-11
Ju
n
io C
Hama
n
o
a
l
low gi
t
-bundle to create b
o
ttomless bu
n
d
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-10
Junio C Ham
a
no
M
erge b
r
anch
'
l
t/readtr
e
e'
commit
|
commitdiff
|
tree
2007-08-10
Junio C Ha
m
a
n
o
Optim
i
ze
"diff --cached"
performance
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-10
Junio
C Ham
a
no
Rever
t
"tweak manpag
e
formatting
"
commit
|
commitdiff
|
tree
2007-08-10
Junio C
H
a
m
ano
twe
a
k
m
anpage for
m
atting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-10
Ju
n
io C Hamano
Fix
an
i
llustra
t
ion i
n
git-rev-parse
.
txt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-10
Ju
n
io
C
Ha
m
ano
Fix formatting o
f
git
-
blame documentati
o
n
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-08
Junio C Hama
n
o
Reorder th
e
l
i
st
of comman
d
s in the manual
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-07
Junio C Ham
a
no
Fix "ma
k
e GZ=1 q
u
i
c
k
-
install-doc"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-07
J
u
nio C
H
amano
pa
g
e
r
: find out p
a
g
e
r setting from configurati
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-06
Junio C
Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2007-08-06
Junio
C
H
amano
setup
.
c:verify_
n
on_filename():
d
on't die u
n
n
ec
e
ssari
l
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-06
Junio C
Hama
n
o
Merge br
a
nch 'mas
t
e
r
'
of
git://linu
x
-
n
fs
.
org/~
b
fields/g
i
t
commit
|
commitdiff
|
tree
2007-08-05
J
u
nio C Hamano
user-manual: mention git stas
h
commit
|
commitdiff
|
tree
2007-08-05
J
u
nio C
Hamano
Fix instal
l
-
doc-quic
k
target
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-05
Ju
n
io C
H
a
m
ano
unpack-trees
.
c: ass
u
m
e submo
d
ules are cl
e
an during
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-04
Junio C Haman
o
I
NSTALL: ad
d
warning on doc
b
ook-xsl 1
.
72
and 1
.
7
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-04
Ju
n
io C
H
am
a
no
git-c
o
mpletion: add "git stash"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-03
Junio C Hamano
GIT 1
.
5
.
3
-rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-03
J
u
nio C Ha
m
an
o
Fix bog
u
s us
e
of p
r
intf
in t3700
t
est
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-03
J
u
nio C Ham
a
no
g
i
tweb: do not cho
k
e on r
e
cursive symlink
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-08-03
J
u
n
i
o C Hama
n
o
Fix wo
r
k-tree relat
e
d
breakages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next