repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'js/transport-helper-error-reporting-fix' into fc/makefile
2013-05-09
David Aguilar
m
e
r
g
etoo
l
s/
k
diff3: do
not u
s
e --auto w
h
en di
f
fing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David Ag
u
ilar
help
.
c: add a c
o
m
patibility comment to cmd_version
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Ag
u
ilar
co
n
trib/mw
-
to-git/t/install-wiki
.
sh:
use
a lowerca
s
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
contrib/ex
a
mples/git-remote
.
perl:
use
a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David
A
guilar
tests: use
a lowe
r
case
"
us
a
ge
:
"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
i
d
Ag
u
ilar
gi
t
-svn
:
use a low
e
rcas
e
"us
a
g
e:" st
r
in
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
Documenta
t
i
o
n/user-manual
.
txt: use a lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Agu
i
l
a
r
t
e
m
plates/hooks--update
.
s
amp
l
e: use a lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguil
a
r
contrib/h
o
oks/
s
etgitperms
.
pe
r
l: use a lowercase "u
s
age
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Ag
u
ilar
contrib/
e
xamples: use
a
l
owercase "usage:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
co
n
trib/fast-impor
t
/import-
z
i
p
s
.
py:
u
se spaces ins
t
ead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contri
b
/f
a
st-import/import-zips
.
py: fi
x
b
roken
erro
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/
f
ast-impo
r
t: use a lowercase "us
a
g
e
:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
cont
r
ib/credent
i
al: us
e
a
lowerca
s
e "us
a
ge
:
" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
git-
c
vsimp
o
rt: u
s
e
a
lowe
r
case "usage
:
" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
git-cvsimpo
r
t: use a lowerc
a
se "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-cvsexport
c
ommit: use a lowe
r
case
"usage:" s
t
ri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
A
g
u
ilar
git-arc
h
i
m
p
o
rt: use a low
e
rca
s
e
"usage:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguil
a
r
gi
t
-m
e
rge-one
-
file:
u
se a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ila
r
git-relink: use a lower
c
a
s
e "u
s
a
g
e:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
git-svn: use a lowerc
a
se "usa
g
e:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
gi
t
-sh
-
setup: use a
l
o
wercase "usage
:
"
s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
Dav
i
d
Aguilar
t7800: "defaults" is no longer
a
builtin
t
ool n
a
me
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
D
a
vid Aguil
a
r
t7800:
m
odern
i
ze tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David Aguilar
t780
0
: up
d
at
e
copyright noti
c
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
D
avid Agu
i
lar
d
i
ffto
o
l: silence uninitialized varia
b
l
e w
a
rning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
D
avid Ag
u
ilar
p
4merge: fi
x
p
r
intf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
Davi
d
Aguilar
diff
t
oo
l
--hel
p
er: fix printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguila
r
doc: genera
t
e a
l
i
s
t of valid
m
erge
tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
D
avid Aguila
r
mergetool--lib
:
a
d
d functions for findi
n
g
a
v
a
ilable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
D
avid Ag
u
ilar
mergetool--lib: improve t
h
e
help text
i
n guess_merge_tool(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mer
g
etoo
l
-
-
lib: simplify comma
n
d exp
r
essions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Dav
i
d
Aguilar
mergetools
:
simplify how we handl
e
"vim" and "
d
efaults
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
D
av
i
d
A
gui
l
ar
mergeto
o
l--lib:
i
mprove sh
o
w_too
l
_
h
elp() output
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Agui
l
ar
merget
o
ols/vim
:
remove redundant diff comma
n
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
David Aguilar
merge
t
ools/p4merge
:
H
onor $TMPDIR f
o
r the /de
v
/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
D
a
vid Aguilar
mergetools/p
4
m
e
rge: Han
d
le "/dev/nu
l
l"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David A
g
uilar
mer
g
etool--
l
ib: Allow cu
s
t
om commands
t
o override b
u
ilt-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Da
v
i
d
A
g
u
ilar
git
k
:
Rena
m
e 'tagconte
n
ts'
to 'cached_tag
c
ontent
'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David
A
guilar
gitk: Te
a
ch "Reread r
e
f
e
r
ences"
t
o reload t
a
g
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
Dav
i
d A
g
uilar
mergetool,difftool: Docu
m
ent --to
o
l-h
e
lp c
o
nsist
e
nt
l
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
a
vid Aguila
r
d
ifftool
:
Disa
b
l
e --symlinks on cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David A
g
uilar
difftoo
l
: Handle compare
(
) return
i
ng -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
avid Ag
u
ilar
d
i
f
f
t
ool:
Wrap long lines for reada
b
ility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
D
a
vid A
g
uilar
difftool: Check all
r
eturn
c
odes
f
rom compar
e
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
D
a
v
i
d
Agu
i
l
a
r
dif
f
too
l
: Handle finding mergetools/ in a pat
h
with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
i
f
f
tool:
U
se
symlinks w
h
en di
f
fi
n
g against
the worktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
A
gu
i
lar
di
f
ftool
:
Call
the tem
p
directory "git-difftool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id A
g
uilar
difftool: Move o
p
tion values
i
nto a
h
ash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Elimin
a
te g
l
obal vari
a
bles
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id
A
guilar
diffto
o
l:
S
implify p
r
int_tool_
h
e
l
p()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David A
g
uilar
t
7
8
00: Te
s
t
difftool pass
i
ng a
r
guments to dif
f
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David Agu
i
lar
mergetoo
l
: Provide
an empty file when
needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David Aguila
r
M
a
k
efile: I
m
pr
o
ve c
o
mpi
l
er h
e
a
der
de
p
endency check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d
A
g
uilar
m
ergetools
/
meld: U
s
e '--output' when available
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David
A
g
u
i
lar
mergetool--
l
ib:
R
e
f
a
ctor tools into sep
a
rate files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David
Aguilar
mergetool--l
i
b
:
M
a
ke
style consistent wi
t
h git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
difftool--helper: Make style consisten
t
wit
h
git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David Agui
l
ar
t/t
7
503-pr
e
-commit-hook
.
sh: Add GIT_PREFIX
t
ests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguil
a
r
git
-
m
e
rgetool--l
i
b: M
a
k
e
v
imdiff retain the
c
u
r
r
e
nt
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
avid Aguilar
g
it
:
Remove
h
andling for GIT_PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David
A
guilar
setup: Provide GIT
_
P
R
EFIX to built-
i
ns
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Dav
i
d Aguilar
s
u
b
modul
e
syn
c
: Update "submodul
e
.
<name
>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David Aguilar
mergetool: Ski
p
autoresolved p
a
ths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David
A
g
u
ilar
Documenta
t
ion: Expl
a
in git
-
mergetool's
u
se of tempo
r
ary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David Aguilar
Makefi
l
e: R
e
move usag
e
of depreca
t
ed Python "has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
D
avid Agui
l
ar
difftool: Fix '--gui' when di
f
f
.
guitool is u
n
config
u
red
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David Ag
u
i
lar
t7800-difftool
.
sh: Test me
r
getool
.
prompt fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
Da
v
id Ag
u
i
l
a
r
difftool: Up
d
ate c
o
p
yright notices to
list each year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David
A
g
u
i
l
ar
diff
t
oo
l
: Use
e
v
al
t
o
e
x
p
and '
-
-extcmd
'
expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Dav
i
d Aguilar
diff
t
ool: Add '
-
x' and a
s
an a
l
ias for
'
--extc
m
d
'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David
A
g
uil
a
r
t7800-difftool
.
sh:
S
implify the
-
-extcmd test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
git-diff
.
txt:
Li
n
k to g
i
t-
d
ifftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Ag
u
ilar
difftool:
A
llo
w
spe
c
ifying unc
o
n
f
igur
e
d commands
w
ith
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid Aguilar
difftool--h
e
lper: Remove use of the GIT_MERGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid Aguilar
difftool--helper: Update co
p
yright and remove distract
i
n
g
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
Da
v
id
A
gui
l
a
r
gi
t
-d
i
ffto
o
l: Add '--gui' for selecti
n
g
a
GUI
t
o
ol
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
t7800-dif
f
tool: Set a bogus tool for
u
se by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
D
a
vid Aguilar
help: Do
no
t
unnecessarily lo
o
k fo
r
a repos
i
tory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
Dav
i
d Aguil
a
r
submodule
.
c:
S
quelch a
"use befo
r
e assign
m
ent" wa
r
ni
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid Aguilar
dif
f
: generate
p
retty fil
e
n
ame
s
in pr
e
p_te
m
p_
b
lob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
Agu
i
lar
compat: ad
d
a bas
e
name(
)
compatibility functi
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d
Ag
u
ila
r
compat
:
a
d
d a mkstemp
s
() compatibility
func
t
i
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
Aguilar
Add git-replace to
.
giti
g
nore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David Agu
i
lar
me
r
getool--lib: ad
d
sup
p
ort for ara
x
is merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
Da
v
id Ag
u
il
a
r
merg
e
t
o
ol--lib: spe
c
ialize diff
optio
n
s for emer
g
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
mergetool--l
i
b: simplify API
u
sage
b
y removing more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avi
d
Aguilar
difftoo
l
/merg
e
t
o
ol:
r
ef
a
ctor commands
to use git-me
r
getool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
mergetool: use
$(
.
.
.
) instead of `backticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
bash c
o
mpletion: add git-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
difftoo
l
: a
d
d support for a diff
t
ool
.
p
rompt config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
d
i
fftool: add various g
i
t-d
i
fftool tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
difftool: move 'git-di
f
ftool' out
of con
t
rib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
d
i
fftool:
a
d
d a -y
s
hortcut
f
or --n
o
-p
r
ompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difft
o
ol: use p
e
rl built-ins when testing for
msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
dif
f
tool: r
e
m
o
ve th
e
ba
c
kup file fea
t
ure
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
i
fftool: rem
o
ve me
r
g
e
optio
n
s for open
d
iff, tkdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
Dav
i
d Aguil
a
r
everyda
y
:
use the dashle
s
s f
o
r
m
of
g
it
-
init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David Aguilar
contrib
/
difftool: use a separate config namespace for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David
Aguilar
c
ontrib/diff
t
oo
l
: Don't repeat
m
erge
t
o
ol candidates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next