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
Ferry Huberts
Fix missp
e
lled merget
o
ol
.
ke
e
pBackup
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
difftool/merg
e
tool: refactor command
s
to use
g
it-mergetool
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
mergetool: use $(
.
.
.
) instead of `backti
c
ks
`
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid A
g
uilar
bash completion: add git-diff
t
ool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
dif
f
t
o
ol: ad
d
support for a difftool
.
prompt config
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
difftoo
l
: add
v
a
r
ious
g
it-difftool tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
difftool: move
'
g
it-difftool' o
u
t of contrib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Sebastian Pipping
difftool/mergetool
:
add diffuse as merge and diff tool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
A
g
ui
l
ar
d
iff
t
ool: add a -y shortcut for
-
-no-
p
rompt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
dif
f
tool:
u
se p
e
rl built-ins wh
e
n te
s
ting for msys
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: r
e
move
th
e
ba
c
k
u
p file f
e
at
u
re
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid A
g
uilar
difftool:
remove merge
optio
n
s for opendif
f
, tk
d
iff
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
M
a
rkus H
e
i
delberg
git-mergetool: ad
d
new me
r
ge to
o
l TortoiseMerge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
M
arkus H
e
idelber
g
git-mergeto
o
l/difftool:
m
ake (g)vimdiff workable under
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Mark
u
s
H
e
ide
l
berg
doc/merge-config: list ecmerge as
a
b
uilt-in merge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Mat
t
hi
e
u Moy
git-
r
e
v
-list
.
txt: make a
s
cii markup uniform wi
t
h other
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Matt
h
ieu
Moy
git-send-ema
i
l
.
txt:
c
larify
whic
h
options t
a
k
e
an argu
m
ent
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Junio C Hama
n
o
M
e
rge branch 'jc/name-branch'
commit
|
commitdiff
|
tree
2009-04-06
J
unio C Hamano
Merge
b
r
anch 'jc/sh
a
re
d
-lite
r
al
l
y'
commit
|
commitdiff
|
tree
2009-04-06
Junio C Hamano
Merge branch 'mg/tracked-local-branches'
commit
|
commitdiff
|
tree
2009-04-06
Ju
n
i
o
C
Hamano
Merge b
r
anch 'sb/format-
p
atc
h
-pat
c
h
name
'
commit
|
commitdiff
|
tree
2009-04-06
F
e
lipe Contreras
u
ser-man
u
a
l
: the name of the hash fun
c
tion
is SHA-1
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
F
elipe Contreras
docbook: chang
e
css s
t
y
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Fel
i
pe Contreras
user-
m
anual: remove some
g
i
t-foo us
a
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Santi
B
éjar
Documenta
t
ion: branch
.
*
.
m
erge
can
a
ls
o
affe
c
t 'git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Heiko
V
oigt
A
dd configuration variab
l
e for sign-off to
f
ormat-patch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
T
od
d
Zullinger
b
ash c
o
mplet
i
on
:
Update
'git am' options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Junio C Hamano
M
e
rge br
a
nch '
m
ain
t
'
commit
|
commitdiff
|
tree
2009-04-05
Julien Danjou
git submodule: f
i
x usag
e
line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Junio C Hama
n
o
Merge br
a
nch
'
maint-1
.
6
.
1' into ma
i
nt
commit
|
commitdiff
|
tree
2009-04-05
Junio C Hamano
Merge b
r
anch 'main
t
-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-05
Markus Heidelberg
doc/git-pack-refs: fix two grammar issue
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Jef
f
King
te
s
ts: remove exit after tes
t
_done
c
all
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Jeff King
com
m
it: abort c
o
mmit if
interactive add
failed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Christian
Couder
bisect: improve
e
rror mess
a
ge when branch che
c
kout
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
D
a
n
McGee
g
it-repack: use non-d
a
s
hed
update-server-info
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
J
ay Soffian
s
e
nd-email: fix n
a
st
y
bug i
n
ask(
)
fu
n
ct
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Update draft
r
elease notes to
1
.
6
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
J
u
ni
o
C
H
a
mano
Sync with 1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Junio
C
Hamano
GI
T
1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Jun
i
o
C
Hamano
M
e
rge branch 'jc/maint-1
.
6
.
0-blame-s'
in
t
o maint
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge bra
n
ch 'js/ma
i
n
t
-dif
f
-temp-smudge' into maint
commit
|
commitdiff
|
tree
2009-04-02
Junio C
Hamano
Merge b
r
anch 'js/maint-1
.
6
.
0-
e
xec
-
pa
t
h-env' into main
t
commit
|
commitdiff
|
tree
2009-04-02
Junio C H
a
mano
Merge br
a
nc
h
'bc/maint-1
.
6
.
1-branch-de
l
eted-was' into
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hama
n
o
Merge bran
c
h 'tr/
m
aint-1
.
6
.
1
-
d
o
c-for
m
at-patc
h
-
-root
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Junio
C
H
a
mano
Merge branch 'dm/maint-d
o
cco
'
into maint
commit
|
commitdiff
|
tree
2009-04-02
Jay S
o
f
f
i
a
n
send
-
email: ensu
r
e qu
o
t
e
d addr
e
sses
a
re rf
c
2047 e
n
code
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Jay Soffian
sen
d
-email: cor
r
ec
t
two
tests
which were
going interactive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Junio
C
H
amano
M
e
rge branch 'ef/fast
-
export'
commit
|
commitdiff
|
tree
2009-04-02
Junio C
H
amano
M
er
g
e bra
n
ch
'
mh/format-patc
h
-add-
h
eader'
commit
|
commitdiff
|
tree
2009-04-02
Junio C Haman
o
Merge branch 'tr/
m
a
int-
1
.
6
.
1-doc
-
format-patch
-
-
root'
commit
|
commitdiff
|
tree
2009-04-02
Juni
o
C Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2009-04-02
J
unio
C Haman
o
Merge branch '
m
a
i
nt-1
.
6
.
1
' into maint
commit
|
commitdiff
|
tree
2009-04-02
Junio C Ha
m
ano
Merge branch
'
ma
i
nt-1
.
6
.
0' into mai
n
t-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
M
e
rge branc
h
'cj/doc
-
format'
commit
|
commitdiff
|
tree
2009-04-02
Ju
n
io
C
Hamano
Merge branc
h
'jc/mai
n
t-1
.
6
.
0-k
e
ep
-
pac
k
'
commit
|
commitdiff
|
tree
2009-04-02
J
unio
C
Hamano
M
erge br
a
nch
'
k
b
/track
i
ng-count-no-merges'
commit
|
commitdiff
|
tree
2009-04-02
Wesley J
.
Lan
d
aker
D
o
c
u
ment
a
tion: git-sv
n
: fix trunk/
f
etch s
v
n
-rem
o
te
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Björn Ste
i
nb
r
in
k
Mail
m
a
p: A
l
low
empty email
addresses to be mapped
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Mi
c
h
ael J Gruber
Make local branch
e
s b
e
have li
k
e re
m
ote
b
ranches
when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Heiko Voigt
Clea
n
up warning about known issues
i
n cvsimport d
o
cumentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Holger Weiß
Documentation: Remove an odd "instea
d
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Jay
Soffian
s
e
n
d-emai
l
: a
s
k_
d
efault
s
hould apply t
o
all emai
l
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Jay Soffian
send-emai
l
: don't attempt to pr
o
mpt if tty is c
l
osed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Jeff King
t1301: loosen
test for forced mod
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Jeff King
fix portability
problem with I
S
_RUN_COMMAND_ERR
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Stephen Boyd
form
a
t_sanitized_
s
ubj
e
ct: Don't
t
r
im
past initial l
e
ngth
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Chris
Jo
h
nsen
D
ocumentation: us
e
"spurious
.
sp" XSLT if DOCBOOK_SUPPRE
S
S_S
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Jo
h
a
nnes Sc
h
indelin
mailmap:
resurrect
lower-c
a
sing of email addr
e
sses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Junio C
Hamano
Mer
g
e git:/
/
git
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2009-04-01
Ali
G
ho
l
ami Ru
d
i
builtin-c
l
o
n
e
.
c:
no
n
ee
d
to strd
u
p for setenv
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Ali Gholami Ru
d
i
builtin-clone
.
c: make
j
u
nk_pid st
a
tic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Jun
i
o C Ham
a
n
o
M
erge br
a
n
c
h '
m
aint'
commit
|
commitdiff
|
tree
2009-03-30
Junio C Ha
m
ano
Update draft release no
t
es t
o
1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
J
u
n
io C
H
ama
n
o
Merge br
a
nch 'm
a
i
nt-1
.
6
.
1
'
into maint
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hama
n
o
Merge b
r
anch
'maint-1
.
6
.
0' in
t
o maint-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
Santi Béjar
Do
c
u
m
en
t
ation: push
.
default applies t
o
al
l
rem
o
tes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Santi
Béjar
D
ocument
a
tion: enhance bra
n
ch
.
<n
a
m
e
>
.
{remote,
m
erge
}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Daniel Cheng (
a
ka
.
.
.
Fix ba
s
h completion in path
with spac
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Th
o
m
as Ra
s
t
bas
h
compl
e
tion: only show 'log --
m
er
g
e' if merging
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Nico -telmi
c
h- Schot
.
.
.
g
i
t
-tag
(
1)
:
ad
d
hint about commit messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
A
l
lan Caffe
e
Documentati
o
n
:
upd
a
te graph api example
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Junio
C H
a
m
a
n
o
M
e
rg
e
branch 'maint'
commit
|
commitdiff
|
tree
2009-03-30
Jun
i
o C Hama
n
o
Merge b
r
anch
'
maint-
1
.
6
.
1' int
o
maint
commit
|
commitdiff
|
tree
2009-03-30
Junio
C
H
a
m
ano
Merge
branch 'ma
i
nt-1
.
6
.
0'
into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
J
ay
S
offian
send-email: a
d
d
t
est
s
f
or refa
c
t
ored prompting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Jay
S
offian
send-em
a
il: refactor and ensure
p
rompting
d
o
esn'
t
loo
p
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
E
ric Won
g
git-
s
vn: fix ls-t
r
ee usage with dash
-
prefixed paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Johannes S
c
hindelin
import-zips: fix thinko
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Erik
Faye-Lund
builtin-fast-ex
p
ort
.
c: h
a
n
d
l
e n
e
s
t
e
d tags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
E
rik Faye-Lund
builtin-fast-export
.
c: fix cr
a
sh on tagged trees
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Eri
k
F
a
y
e-Lund
b
u
iltin-fast-export
.
c
:
turn
e
rr
o
r int
o
warning
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Erik Faye-Lund
test
-
suit
e
: adding a test
for fast
-
export wi
t
h
tag
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
J
u
nio C Hamano
set_shared_p
e
rm(): sometimes we know what the final
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Junio C
H
amano
move
_
temp_to_file(): do not
fo
r
g
e
t to chmod() in "Coda
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hamano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2009-03-28
J
u
nio C Hamano
Update dr
a
f
t release
n
ot
e
s to 1
.
6
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Junio C
Haman
o
Merge branch 'jc/maint-1
.
6
.
0-diff-bor
r
ow-c
a
r
e
fully
'
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hama
n
o
Merge b
r
anch 'js/rem
o
te-improvements'
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hamano
Merge
b
ranch 'jk/clone-post-checkout'
commit
|
commitdiff
|
tree
next