repo.or.cz
/
git
/
spearce.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Fix misspelled mergetool.keepBackup
2009-04-11
Ferr
y
H
u
berts
Fix misspelled m
e
r
g
etool
.
keepBackup
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difft
o
o
l
/mergeto
o
l: refa
c
tor
c
o
m
mands
t
o use git-mergetool
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
i
d Aguilar
merge
t
ool: use
$(
.
.
.
) in
s
tead of `backticks`
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
bash completion: add git-d
i
fftool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
i
d Aguil
a
r
d
i
fftool:
a
dd support
f
or a difftoo
l
.
prom
p
t co
n
fi
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
diffto
o
l: add v
a
rious git-difftool tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
difftool: mov
e
'
g
i
t
-
d
i
fftool
'
o
u
t of contrib
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
S
e
bastia
n
Pipping
difftool/m
e
rgetool: add diffuse as
merge and diff tool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid
Aguilar
difftool:
a
dd
a -y sh
o
rt
c
ut for --no-
p
rompt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d
Aguilar
difftool: use perl built-ins when testi
n
g
f
or msy
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
g
uilar
dif
f
to
o
l:
r
emove the backup f
i
le fe
a
ture
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguil
a
r
di
f
ftool: r
e
move merge options for opendiff, tkdiff
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Ma
r
kus Heid
e
lbe
r
g
git-mergetool: add new m
e
rge tool TortoiseM
e
rge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Markus
H
eidelberg
gi
t
-mergetool/difftool
:
m
ake (
g
)
vimdi
f
f
w
o
rkab
l
e un
d
e
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Mark
u
s Heidelber
g
doc/merge
-
c
o
nfig: list
e
cmerge as a buil
t
-in merge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
M
a
tthieu Moy
git-
r
ev-list
.
txt: make
a
scii mark
u
p uniform with o
t
her
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu
Moy
git-send-email
.
txt: clarify
w
hich op
t
ions
take an argume
n
t
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-06
Junio C Ha
m
ano
Merge branch 'jc/n
a
m
e
-branch'
commit
|
commitdiff
|
tree
2009-04-06
Juni
o
C Hamano
Mer
g
e bran
c
h
'jc/s
h
a
r
ed-literally'
commit
|
commitdiff
|
tree
2009-04-06
Junio C Hamano
M
e
rge branc
h
'
m
g/tracked-local-branches
'
commit
|
commitdiff
|
tree
2009-04-06
Junio C Hama
n
o
Merge branch 'sb/fo
r
mat-patch-patchname'
commit
|
commitdiff
|
tree
2009-04-06
Feli
p
e Contrera
s
u
ser
-
manual
:
the nam
e
of the
h
ash fun
c
tion is SHA-1
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-06
F
e
lipe Contr
e
ras
docbook
:
c
h
ange cs
s
style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-06
Felipe
Contreras
u
s
er-manual: remove some git-foo usage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-06
S
anti B
é
jar
Documentation: branch
.
*
.
merge can als
o
affect
'git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-06
Heiko
V
oigt
Ad
d
configuration var
i
able
for s
i
gn-off to
f
ormat-patch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Todd Zul
l
inger
b
a
sh
c
o
m
pleti
o
n: Update 'gi
t
am' o
p
tions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
J
unio C Hamano
Merge
bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2009-04-05
J
u
lien Dan
j
ou
git submod
u
le: fix usage li
n
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Junio C Hamano
Merge
branch
'main
t
-
1
.
6
.
1'
into maint
commit
|
commitdiff
|
tree
2009-04-05
Junio C H
a
mano
M
erge bra
n
c
h
'maint-
1
.
6
.
0' i
n
to ma
i
nt-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-05
Markus
Heidel
b
erg
d
oc/git-p
a
ck-refs: fix
t
wo grammar iss
u
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Jeff King
tests: remove exit after test_done call
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
J
e
f
f K
i
n
g
com
m
i
t:
abort
commit if inter
a
ct
i
ve ad
d
failed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Christian Co
u
d
er
bisect
:
impro
v
e er
r
or message when bra
n
ch checko
u
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Dan McGee
git-
r
ep
a
ck: use non-da
s
h
e
d
update-server-info
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
J
ay
So
f
fian
se
n
d-
e
ma
i
l
: fix nasty bug
i
n ask(
)
function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
Junio
C
H
am
a
no
Upd
a
te dra
f
t
r
e
l
e
ase
n
otes
t
o 1
.
6
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
Junio C
Ham
a
no
S
y
nc
w
ith 1
.
6
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
Ju
n
i
o
C Hamano
GIT 1
.
6
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
J
unio C Hamano
Merge branch 'j
c
/
maint-1
.
6
.
0
-
blame-s' into maint
commit
|
commitdiff
|
tree
2009-04-02
J
uni
o
C Hamano
M
e
r
g
e branch 'js/
m
a
i
n
t-diff-temp-smudge' int
o
maint
commit
|
commitdiff
|
tree
2009-04-02
J
unio C
H
ama
n
o
Merge bran
c
h 'js/maint-1
.
6
.
0-
e
xec-p
a
t
h-env' into
maint
commit
|
commitdiff
|
tree
2009-04-02
J
u
ni
o
C Hamano
Merge
b
r
anch 'bc/maint-1
.
6
.
1-b
r
anch
-
delet
e
d
-
was' into
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
J
unio C Hamano
M
erge branc
h
'tr/maint-1
.
6
.
1-doc-format-patch
-
-root
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Junio C Ha
m
ano
Merge branch 'dm/mai
n
t-docco' into maint
commit
|
commitdiff
|
tree
2009-04-02
Jay Soffian
send-email: ensure quoted add
r
esses are rfc2047 encoded
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
J
a
y
Soffi
a
n
send
-
email: cor
r
ect two t
e
sts
which were goin
g
i
nteractive
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
Junio
C Hamano
M
e
rge branch '
e
f/fast-export'
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Me
r
ge bra
n
ch 'mh/fo
r
mat-patch-add-
h
eader'
commit
|
commitdiff
|
tree
2009-04-02
Junio
C
Hama
n
o
Me
r
ge b
r
an
c
h 't
r
/maint-1
.
6
.
1-d
o
c-
f
orma
t
-patch--
r
oot'
commit
|
commitdiff
|
tree
2009-04-02
Junio
C Ham
a
no
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2009-04-02
Junio C
Hamano
Merge branch
'mai
n
t-1
.
6
.
1' into
main
t
commit
|
commitdiff
|
tree
2009-04-02
Junio C H
a
mano
Merge br
a
nch
'
maint
-
1
.
6
.
0' into mai
n
t-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-02
Junio C
H
amano
Me
r
g
e b
r
anch '
c
j
/doc-format'
commit
|
commitdiff
|
tree
2009-04-02
Jun
i
o
C
Hamano
Merge branch
'
jc/maint-1
.
6
.
0-keep-pac
k
'
commit
|
commitdiff
|
tree
2009-04-02
Junio C Ha
m
ano
Merge
bran
c
h 'kb/track
i
ng-c
o
unt-no-merges'
commit
|
commitdiff
|
tree
2009-04-02
W
e
sley J
.
L
a
n
d
aker
Documentation: g
i
t
-s
v
n: fix trunk/fetch svn-remote
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
B
jörn Steinbrink
Mai
l
ma
p
: Allo
w
empty
e
mail addresses
t
o be map
p
e
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Mic
h
a
el J Gru
b
e
r
Ma
k
e local branches behave like r
e
m
ote branches whe
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Hei
k
o Voigt
Cleanup
w
a
r
ning a
b
out known
i
ss
u
es in cvsimport
d
ocume
n
tation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Holger Weiß
D
ocume
n
t
a
tion
:
Remove an od
d
"
i
n
stead"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Ja
y
Soffian
s
e
nd-ema
i
l
:
as
k
_default sho
u
ld a
p
ply to all emails
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Jay Soffian
send-emai
l
: don't
attempt to prompt if tty i
s
closed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Jeff King
t1
3
01: loosen test for force
d
modes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Jeff King
fix
p
ortability probl
e
m with IS_R
U
N
_COMMAND_ERR
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Stephen Boyd
format_saniti
z
ed
_
subje
c
t: Don't trim past initial le
n
g
t
h
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Chris Joh
n
se
n
Do
c
umenta
t
ion: use
"spuri
o
us
.
sp
"
XSLT
i
f DO
C
B
OOK_SUPP
R
ES
S
_S
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Johannes Schindelin
mailmap:
r
esurrect lower-casing
o
f
e
ma
i
l addr
e
s
ses
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Ju
n
io
C Hamano
Merge gi
t
://git
.
bogomip
s
.
org/git-s
v
n
commit
|
commitdiff
|
tree
2009-04-01
Ali Gholami Rudi
bui
l
tin-cl
o
n
e
.
c
: no need to
s
t
r
dup for setenv
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Ali Gh
o
lami
Rudi
b
u
i
l
t
i
n
-
c
l
one
.
c: mak
e
junk_pid
static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hamano
Merg
e
b
r
anch
'main
t
'
commit
|
commitdiff
|
tree
2009-03-30
J
uni
o
C H
a
mano
Update draft
release notes
t
o 1
.
6
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
J
u
nio C Hama
n
o
Merge branch 'maint-
1
.
6
.
1' int
o
maint
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hamano
Merge bran
c
h
'
main
t
-1
.
6
.
0' in
t
o maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
Santi Béjar
Document
a
tion: push
.
default applies to all rem
o
tes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Santi
Béjar
Documentati
o
n:
e
n
hance
b
ranc
h
.
<name>
.
{remote,merge}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Da
n
iel Cheng (aka
.
.
.
F
ix
bash completion i
n
p
a
t
h with spaces
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Thomas Rast
bash
c
omple
t
ion: only show 'log --merg
e
'
if mer
g
ing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Nico -telmich- Sc
h
ot
.
.
.
git-tag(1): add
hint about com
m
it messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Alla
n
Caffee
Documentatio
n
: update graph ap
i
exam
p
le
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Junio C Haman
o
Merge
branch
'
main
t
'
commit
|
commitdiff
|
tree
2009-03-30
Jun
i
o C Hamano
Merge bra
n
ch 'maint-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-03-30
Juni
o
C H
a
mano
Merg
e
branch 'maint-1
.
6
.
0' into maint
-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
Jay Soffian
send-ema
i
l: add
tests for re
f
actored
prompti
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
J
a
y
S
offia
n
send
-
email: refact
o
r and e
n
sure prompti
n
g doesn't loop
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Eric Wo
n
g
git-svn: fix
l
s-t
r
ee
u
sage with dash-prefixed paths
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Johannes Schinde
l
in
import-zips: fi
x
th
i
nko
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
E
rik Fay
e
-Lund
builtin-fast-export
.
c: ha
n
dle neste
d
tags
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Erik Fay
e
-Lund
builtin-fast-export
.
c:
f
ix crash
on ta
g
ge
d
trees
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Erik Faye-Lu
n
d
builtin-
f
a
s
t-export
.
c: turn error into warn
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Erik Faye-Lu
n
d
test
-
s
u
ite: a
d
ding
a
t
est for fas
t
-export w
i
t
h
tag
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
Jun
i
o C Hamano
s
e
t_shared_perm
(
): somet
i
m
e
s we
k
now wh
a
t the
f
inal
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hamano
move_temp_to_fi
l
e(): do not
forget t
o
chmod
(
) in
"Coda
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
Junio C H
a
m
a
no
M
e
r
g
e branch
'maint'
commit
|
commitdiff
|
tree
2009-03-28
Junio C
H
amano
U
p
date draft rele
a
se notes
t
o 1
.
6
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
Ju
n
io
C Hamano
M
erge bran
c
h 'jc/maint-1
.
6
.
0
-
d
i
ff-borrow-carefully'
commit
|
commitdiff
|
tree
2009-03-28
Junio C H
a
mano
Me
r
ge br
a
nc
h
'js/remote-improvements
'
commit
|
commitdiff
|
tree
2009-03-28
Junio C Ham
a
no
Merge branch 'jk/clone-post
-
check
o
ut'
commit
|
commitdiff
|
tree
next