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
Makefile: fix default regex settings on Darwin
2013-05-11
David Ag
u
il
a
r
M
akefile
:
fix default regex
set
t
ings o
n
Darwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-09
D
a
vid Aguilar
me
r
getools/kdiff3
:
do not use --auto when diffi
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-04-16
David Ag
u
ilar
help
.
c:
add a compatibility com
m
en
t
to cmd_version()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David Aguil
a
r
contrib/mw-
t
o
-git/t/install-wiki
.
sh: use a lowercas
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
id Agu
i
lar
contrib/examples/
g
it-remo
t
e
.
perl: u
s
e a lo
w
ercase
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
tes
t
s: use a lowercase "usage:" st
r
i
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David Ag
u
ilar
git-svn: u
s
e a lowerca
s
e
"usage:"
s
tring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
Doc
u
m
e
n
tation/
u
s
e
r-manua
l
.
txt:
use a lowerc
a
se "usage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
t
empla
t
e
s/hooks--update
.
sa
m
ple: use a lo
w
e
rc
a
se "
u
sage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
co
n
trib/hooks/setg
i
tperm
s
.
perl: use a lo
w
ercase
"
usag
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
co
n
trib/exa
m
ples: use
a
low
e
rc
a
se "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid
Aguilar
contrib/fas
t
-import/import
-
zips
.
py: u
s
e spaces i
n
stead
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
av
i
d Aguilar
contrib/fast-import/import-zips
.
py: f
i
x
b
roken error
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/fast-import: use
a
lowerca
s
e "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
i
lar
contrib/
c
redential: use
a
lowe
r
case "usage:" stri
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
git-cvsimport: use a lowercase "u
s
a
g
e:" str
i
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
i
l
ar
g
i
t-cvsimport: us
e
a lowercas
e
"usage:" strin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
git-cvsexp
o
rtcommit: use
a
lowercase
"
usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
git
-
a
rc
h
import: use
a lo
w
ercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
git-merge-one-file: use a lowercase "usag
e
:"
s
tring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
git-re
l
ink: use a lowercase "usage
:
" s
t
ring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid
A
g
u
i
lar
git-svn: use
a
l
o
w
erca
s
e "
u
sag
e
:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d
Agu
i
la
r
git-sh-se
t
up: use a lowercase
"usage:
"
s
t
r
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t7800: "d
e
fa
u
l
t
s
" is no longer a
builtin t
o
o
l
name
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
Dav
i
d Aguilar
t7800: modernize tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-20
D
avid
A
guilar
t7800: update
c
o
p
y
right not
i
c
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-17
David Aguilar
di
f
ftool:
s
i
lence unin
i
t
ialized var
i
able warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
D
avid Aguilar
p4merge: f
i
x printf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
D
a
v
id Aguilar
d
ifftool-
-
helper: fix printf
usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
Da
v
id Aguil
a
r
d
o
c: ge
n
erate a
li
s
t of valid
m
erge tools
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
merge
t
ool--lib: add
f
unctions f
o
r finding av
a
ilable
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguil
a
r
m
erg
e
to
o
l--
l
ib: improve the help text in
guess_merg
e
_to
o
l()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
merg
e
too
l
--lib: sim
p
l
i
fy command
expr
e
ssions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguil
a
r
mergetools:
simpli
f
y
h
ow we handle
"
vim" an
d
"defaults"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
D
avid Aguilar
mergetool--lib: improve s
h
ow_tool_help()
o
utpu
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
mergetools/vim
:
rem
o
v
e
r
e
dundan
t
diff command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
David Aguilar
m
e
rget
o
ols/p
4
m
erge:
Honor $TMPDIR
f
or the
/dev/nu
l
l
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
Da
v
id Aguilar
mergetools/p4me
r
ge: Hand
l
e
"
/dev/null
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
D
a
vid Aguilar
m
ergetool--l
i
b: Allow c
u
stom comm
a
nds to
ove
r
ride built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
Dav
i
d Aguilar
gitk: Rename 'tagcontent
s
'
to 'cac
h
e
d_tagcontent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
D
avid Agu
i
lar
gi
t
k:
T
each "
R
eread refe
r
e
n
ces" to reloa
d
tags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
David
A
gui
l
ar
m
ergetool,di
f
ftool:
Docu
m
ent
-
-tool-help con
s
istently
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool:
D
isable --symli
n
ks on cygwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Davi
d
Aguila
r
difftool:
H
andle compare() returning -
1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Da
v
id
Aguilar
dif
f
too
l
: Wrap lo
n
g
l
ines for readabi
l
ity
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
D
avid
A
g
uilar
di
f
ftool: Check all return
c
odes from compare()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David
A
guilar
difftool: Handl
e
fi
n
din
g
merg
e
tools/ in a pa
t
h with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Use symlinks wh
e
n
d
iffing against t
h
e wo
r
k
t
r
ee
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Call the temp directory "git
-
diffto
o
l"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David A
g
uil
a
r
di
f
ftool: Move option values i
n
to a hash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id Aguilar
d
i
f
f
t
ool: El
i
m
i
nate global va
r
iables
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
i
fftoo
l
: Simplify print_tool_help()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
Davi
d
Aguilar
t
7800:
Test d
i
fft
o
o
l pass
i
ng arguments to
diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David
A
guilar
merg
e
too
l
: P
r
ov
i
d
e
an empty fil
e
when needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David Agui
l
ar
Mak
e
file: Impr
o
ve compi
l
er header
d
ependency check
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Davi
d
A
g
u
i
la
r
m
ergetoo
l
s/
m
eld: Use '--output' when available
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
avid
A
gui
l
ar
merget
o
ol--
l
ib:
R
efa
c
tor
t
o
o
l
s
into sep
a
rat
e
files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
merg
e
t
o
ol--li
b
: Make s
t
yle consistent
with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Ag
u
i
l
ar
difftool--helper: Ma
k
e
style consiste
n
t with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David Agui
l
ar
t/t7503-
p
r
e-c
o
mmit-h
o
ok
.
sh:
A
dd GIT_PREFIX tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git-m
e
rgetool--lib: Make v
i
mdiff retai
n
t
h
e curre
n
t
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
a
vid Aguilar
git:
R
emove handling for GIT_PREFI
X
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Dav
i
d Agu
i
lar
setup:
Provide GIT
_
P
R
EFIX t
o
built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
submodule sync: Update "s
u
bmodu
l
e
.
<na
m
e
>
.
u
r
l"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
David Aguil
a
r
mergetool: Skip
a
utoresolv
e
d
p
aths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
D
a
v
id Agu
i
lar
Doc
u
mentat
i
on: Explain
git
-
merget
o
ol's
use of
t
em
p
orary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David Aguilar
Ma
k
e
file: Remove usage of deprecat
e
d Python "has_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
diff
t
ool: Fix '--gui' when
d
iff
.
guito
o
l is unconfigured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David
Aguilar
t78
0
0-d
i
fftool
.
sh
:
Test
m
ergetool
.
prom
p
t
f
all
b
a
c
k
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
difftool: Update co
p
yright notices to list each year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
id
Aguilar
difft
o
ol:
Use ev
a
l
to ex
p
and '--
e
xtcmd' expr
e
ssions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David
A
g
uilar
dif
f
t
ool:
A
d
d '-x'
a
nd
a
s an alias
for
'
-
-ext
c
md'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David A
g
uilar
t7800-difftoo
l
.
sh: Simplify the -
-
e
xtcmd
t
est
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Ag
u
ilar
git-diff
.
txt: Lin
k
to git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Ag
u
i
lar
difftool: Al
l
ow speci
f
y
i
ng unconf
i
gured commands with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguil
a
r
difftool--helper: Remove use of
t
he G
I
T_MERG
E
_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vi
d
A
guil
a
r
difftool--helpe
r
: Update c
o
pyright and remove
d
i
stracting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
gi
t
-difftool: Add
'--gui' for s
e
lect
i
ng a
GU
I
t
ool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David
Aguilar
t7800-difftool: S
e
t a bogus tool for us
e
by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
Da
v
id Aguil
a
r
help: Do not unnecessarily
l
oo
k
for a repo
s
i
tory
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
Da
v
id Aguilar
submo
d
ule
.
c: Squelch a "use befo
r
e assignment
"
war
n
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
dif
f
: generate pr
e
tty fil
e
na
m
e
s
in prep_tem
p
_blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Agui
l
a
r
c
o
mpat: add a basen
a
m
e(
)
com
p
atibi
l
it
y
function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat:
add
a
mkstemps() c
o
m
p
a
t
i
bility f
u
n
ct
i
on
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
A
guilar
Ad
d
git-replace to
.
gitign
o
r
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
D
avid Aguilar
m
er
g
e
too
l
--lib: ad
d
support fo
r
arax
i
s merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
D
a
vid
A
guilar
mergetool--lib: specia
l
ize d
i
f
f
op
t
i
ons for emerg
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
me
r
g
e
to
o
l--lib: sim
p
lify
API usage by removi
n
g more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
diffto
o
l/mergetoo
l
: refact
o
r c
o
m
m
ands to u
s
e git-mergetool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
mergetool: use $(
.
.
.
) ins
t
ead of `backt
i
cks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Ag
u
ilar
bash compl
e
tion: add
g
i
t
-
diff
t
o
o
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
dif
f
tool: add supp
o
rt for
a difftool
.
prompt config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
diff
t
ool: ad
d
va
r
ious git-difftoo
l
t
ests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
diff
t
o
o
l: mov
e
'
g
it-difft
o
ol' out of c
o
ntrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Ag
u
i
lar
d
iffto
o
l: add a -y shortcut for --
n
o-promp
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
d
i
fftool:
u
se perl buil
t
-ins when testing f
o
r
msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
d
i
ffto
o
l: remove the backup
f
ile
feature
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
dif
f
t
o
o
l
: rem
o
v
e me
r
ge opt
i
ons for opendiff, tk
d
iff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Aguilar
ever
y
day:
use the dashless
fo
r
m o
f
g
i
t-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
Da
v
id Agui
l
ar
co
n
trib/difft
o
ol: use a separ
a
t
e
c
onfi
g
na
m
espace f
o
r
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
next