repo.or.cz
/
git
/
mingw
/
j6t.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
difftool/mergetool: refactor commands to use git-mergetool--lib
2009-04-08
David
A
g
uilar
difftool/me
r
getool: refactor commands to us
e
git-
m
ergetool
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
mergetool: use $(
.
.
.
)
ins
t
ead of
`backtick
s
`
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
bash
c
o
mple
t
ion: add gi
t
-dif
f
t
o
o
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
difftool:
a
dd
support
for a diff
t
ool
.
prompt
config
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
u
ilar
difftool: add various git-difftool tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: move 'git-difft
o
ol'
o
ut of contrib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Sebastian Pip
p
ing
difftool/m
e
rgetool
:
add diffuse as m
e
rge and dif
f
tool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guila
r
difftool
:
add a -
y
shortcut for -
-
n
o
-
p
ro
m
pt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
A
g
ui
l
a
r
difft
o
ol: use perl built-ins wh
e
n
testi
n
g
f
o
r
m
sys
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
dif
f
t
o
ol: remove
t
he backup file feature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diffto
o
l:
r
em
o
v
e
merge op
t
ions for
opendiff, tkdiff
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Markus Heidelberg
git-mer
g
etool
:
a
d
d ne
w
merge tool Tort
o
is
e
Merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
M
a
r
k
us Heid
e
lber
g
git-merget
o
o
l
/difftool: make (g
)
vimdiff worka
b
le under
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Markus Heidelberg
d
o
c/mer
g
e-co
n
fig
:
l
ist ec
m
e
rge as a built-in merge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu Moy
git-rev-l
i
st
.
t
x
t:
m
a
k
e
a
scii mark
u
p unif
o
rm with o
t
he
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Ma
t
thieu M
o
y
git-send-email
.
t
xt:
c
larify whic
h
options take a
n
arg
u
m
ent
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Junio C Hamano
Mer
g
e br
a
n
ch 'jc/name
-
b
r
anch'
commit
|
commitdiff
|
tree
2009-04-06
Juni
o
C
H
a
mano
M
erge b
r
anch '
j
c/sha
r
ed
-
literall
y
'
commit
|
commitdiff
|
tree
2009-04-06
Juni
o
C Hamano
Merge
branch 'mg/tracked-lo
c
al-bra
n
ch
e
s'
commit
|
commitdiff
|
tree
2009-04-06
Junio
C Hamano
Merge branch 'sb/f
o
rmat-patch-patchname'
commit
|
commitdiff
|
tree
2009-04-06
Felip
e
C
ont
r
eras
u
s
er-
m
anual: the name
of
t
he
h
ash func
t
ion i
s
SHA-1
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Felipe Contreras
docbook: change
c
ss
s
tyle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
F
e
lipe Contr
e
ras
u
s
er-manu
a
l: re
m
ove some git-foo usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Santi Béjar
D
o
cument
a
tion:
branc
h
.
*
.
mer
g
e
can
also affect '
g
it
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Heiko
Voigt
Add config
u
r
a
tion var
i
able
for sign-off to f
o
rmat-pat
c
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
T
o
dd
Zulli
n
ger
b
a
sh complet
i
on: U
p
dat
e
'git
am' option
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Ju
n
io C Hamano
Merg
e
bran
c
h
'
maint
'
commit
|
commitdiff
|
tree
2009-04-05
Julien Danjou
git
sub
m
odule: f
i
x usage l
i
ne
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' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2009-04-05
Junio C Hamano
Merge bran
c
h 'mai
n
t-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-05
Markus Heidelberg
doc/git
-
pack-r
e
fs: fix two grammar
issue
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Jeff King
test
s
: remove
e
xi
t
after test_do
n
e
call
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Jeff King
commit: abor
t
commi
t
if inte
r
active add f
a
iled
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Chris
t
ian C
o
uder
b
i
s
e
ct: impr
o
v
e
error
message when branch chec
k
ou
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Dan Mc
G
e
e
g
it-repack
:
use non-dashed upda
t
e-serve
r
-info
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Jay Soffian
s
e
nd-
e
mai
l
: fix nasty
b
ug i
n
ask() fun
c
tio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
U
p
dat
e
draft release notes to 1
.
6
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Juni
o
C H
a
m
ano
Sync with 1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
G
I
T 1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Juni
o
C Hamano
Merge branch '
j
c/ma
i
nt-1
.
6
.
0-blam
e
-s'
i
nto maint
commit
|
commitdiff
|
tree
2009-04-02
Junio C
H
am
a
n
o
Merge branc
h
'
j
s/maint-di
f
f-
t
emp-smudg
e
' into m
a
int
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge bran
c
h 'js/maint-1
.
6
.
0-
e
xec-path-env'
into maint
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hama
n
o
Merge
b
r
anch 'bc/maint-1
.
6
.
1-branch-deleted-was' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge branch '
t
r/maint
-
1
.
6
.
1-doc-
f
ormat-patch--
r
oot
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Junio
C
Hamano
Merg
e
b
ran
c
h
'dm/m
a
int-docco' into maint
commit
|
commitdiff
|
tree
2009-04-02
Ja
y
Sof
f
ia
n
send-
e
m
a
il: ensure quoted a
d
d
r
e
s
ses are rf
c
2047 encoded
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Jay Soff
i
an
send-email
:
correct two tests which we
r
e
going int
e
racti
v
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Juni
o
C Hamano
Merge
b
r
a
nch 'ef/fast-expo
r
t
'
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge
b
ranch
'
mh/forma
t
-patc
h
-
add-header'
commit
|
commitdiff
|
tree
2009-04-02
Juni
o
C
Hamano
Merge branch
'tr/
m
aint-1
.
6
.
1-
d
oc-format-patch--root'
commit
|
commitdiff
|
tree
2009-04-02
Junio C Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-04-02
Juni
o
C Hamano
Merg
e
branch
'
maint
-
1
.
6
.
1
' into ma
i
n
t
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge branch 'maint
-
1
.
6
.
0
'
i
n
to maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-02
J
unio C Hamano
M
erge bran
c
h 'cj/
d
oc-for
m
at'
commit
|
commitdiff
|
tree
2009-04-02
Juni
o
C Hamano
Merge branch 'jc/
m
a
i
nt-1
.
6
.
0-keep-pack'
commit
|
commitdiff
|
tree
2009-04-02
J
u
nio C Ha
m
ano
Merge branch 'kb/t
r
a
c
king-count-no-merg
e
s'
commit
|
commitdiff
|
tree
2009-04-02
Wesl
e
y
J
.
Landaker
Docu
m
entation: git-s
v
n: fix trunk/fetch sv
n
-
r
e
mote
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
B
j
örn Steinbrink
Mailmap: Allow empty
e
mail addresses to be ma
p
ped
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
M
i
chael J Grub
e
r
M
ake loca
l
branches
behave like remote branc
h
es when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Heiko V
o
igt
Cle
a
nup warning about k
n
ow
n
issues in
c
vsimport documentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Holger Weiß
D
o
cume
n
tation: Remove an
o
dd "instead"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Jay Soffian
s
e
nd-email: a
s
k
_
default shou
l
d apply
to
all
ema
i
ls
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Jay
S
offian
s
end-email:
d
o
n't att
e
mpt
t
o prom
p
t if tt
y
i
s
c
los
e
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
J
eff Kin
g
t
1
301: loosen test f
o
r forced m
o
des
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Jeff King
fix port
a
bili
t
y problem
w
i
th IS_RUN_CO
M
M
AND_
E
R
R
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Stephen Boyd
fo
r
m
at_sanitize
d
_subject:
Do
n
't
t
rim past initial length
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Chris
J
o
hns
e
n
Do
c
um
e
n
tation
:
u
s
e "spur
i
ous
.
sp" XSLT if DOCBOOK_SUPPRESS_S
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Johan
n
e
s
Schindelin
m
a
ilmap: resurrect low
e
r-casing of email addresses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Junio C
H
a
m
an
o
Merge git://git
.
bogomips
.
org/
g
it-svn
commit
|
commitdiff
|
tree
2009-04-01
A
li Gholami Rudi
builtin-clone
.
c:
n
o nee
d
to s
t
rdup
f
or sete
n
v
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
A
l
i Gholam
i
Ru
d
i
b
uiltin-clone
.
c: make jun
k
_pid static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Ju
n
i
o C
Hamano
Merge
b
r
a
nch
'
maint'
commit
|
commitdiff
|
tree
2009-03-30
Junio C
Hamano
Update d
r
aft r
e
lease notes to 1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hama
n
o
Merge branch 'maint-1
.
6
.
1' into mai
n
t
commit
|
commitdiff
|
tree
2009-03-30
Jun
i
o C H
a
mano
Merge branch 'maint-1
.
6
.
0' i
n
to maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
Santi Béjar
Do
c
umentat
i
on: push
.
defa
u
lt app
l
ies t
o
all remo
t
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Sa
n
ti Béjar
Documentation
:
enhance br
a
nch
.
<name>
.
{r
e
m
o
te,m
e
rge
}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Daniel Cheng (aka
.
.
.
Fi
x
bash
c
omple
t
ion in path
with spaces
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
T
h
omas Rast
b
a
s
h
c
o
m
pleti
o
n: only
s
how 'log --m
e
r
g
e' if merging
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Nico -telm
i
ch-
S
c
hot
.
.
.
git-tag(1
)
: add hint about commit
m
e
s
s
ages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
All
a
n Caffe
e
D
o
cumen
t
ation: u
p
date graph api exa
m
pl
e
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hamano
M
erge bran
c
h 'main
t
'
commit
|
commitdiff
|
tree
2009-03-30
Junio C Ham
a
n
o
M
erge branch 'm
a
i
nt-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hamano
Merge branch '
m
a
i
n
t
-
1
.
6
.
0'
i
n
to
maint
-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
Jay
Soff
i
a
n
s
e
nd-email: add t
e
s
t
s f
o
r
refacto
r
ed prompting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Ja
y
S
o
ffian
send-email
:
refa
c
to
r
and en
s
ure prompting doesn't lo
o
p
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Eric Wong
git
-
svn:
fix l
s
-tree usa
g
e
w
ith da
s
h-prefixe
d
paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Johannes Schindel
i
n
i
m
port-zips: fix thinko
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
E
r
ik Faye-Lund
builti
n
-fas
t
-export
.
c
: handle nested tags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Erik Faye-Lund
builti
n
-f
a
s
t-export
.
c:
fi
x
cras
h
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
builti
n
-
fast-export
.
c
:
turn
error into warning
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Erik Faye-
L
und
test-suite: add
i
n
g
a te
s
t for
f
ast-export with tag
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Junio C H
a
ma
n
o
set_s
h
ared_
p
erm(): sometimes we know
w
h
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_file(): do not
f
orget to chmod() in "Coda
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
J
u
nio C Hamano
Mer
g
e branch 'maint
'
commit
|
commitdiff
|
tree
2009-03-28
Junio
C Hamano
Updat
e
draft release note
s
to 1
.
6
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hamano
Merg
e
b
ranch 'jc/maint
-
1
.
6
.
0-diff-b
o
r
r
ow-
c
arefully'
commit
|
commitdiff
|
tree
2009-03-28
Junio C Haman
o
Mer
g
e branch 'js/remote-improvements'
commit
|
commitdiff
|
tree
2009-03-28
J
unio C
H
amano
Merge branch
'jk
/
clone-po
s
t-checkout'
commit
|
commitdiff
|
tree
2009-03-28
Junio
C
Haman
o
Merge branch
'
ma
i
nt
-
1
.
6
.
1'
into maint
commit
|
commitdiff
|
tree
next