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
pull: add --ff-only to the help text
2014-01-16
Davi
d
Aguilar
pull: a
d
d --ff-only t
o
the help text
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-01-16
David
A
guilar
p
u
l
l
: add pull
.
f
f confi
g
urat
i
on
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-21
David Aguilar
imap-se
n
d
: e
l
iminat
e
HMA
C
deprecation w
a
r
nings on Mac
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-20
D
avid
Aguil
a
r
cache
.
h: eliminate SHA
-
1 deprecati
o
n warni
n
gs on Mac
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-20
Dav
i
d
A
g
uilar
Ma
k
efile: ad
d
s
u
pport for Apple CommonCrypto fac
i
lity
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-11
Dav
i
d Aguilar
Makefile: fi
x
defa
u
lt r
e
gex settings on Darwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-09
David Aguilar
mergetools/kd
i
ff3
:
d
o not u
s
e --auto when diffing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-04-16
David Aguilar
h
e
lp
.
c:
a
dd a compa
t
ibility comment to cmd_versi
o
n()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
D
a
v
i
d Aguilar
cont
r
ib/mw-to-git/t/instal
l
-wiki
.
s
h
:
use a lowercase
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David
A
g
ui
l
a
r
c
ontr
i
b/e
x
amples/gi
t
-remote
.
perl: use
a lowercas
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
id Aguilar
tests: use a lowercase "usa
g
e:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David
Aguilar
git-svn
:
use a lowercase "usage:" st
r
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
Documentation/user-manual
.
txt: u
s
e a lower
c
ase
"
us
a
ge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
templat
e
s/hooks
-
-update
.
sample: us
e
a lowercase "usage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
co
n
trib/hooks
/
se
t
g
itperms
.
perl: use a lo
w
ercase "usag
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
cont
r
ib
/
examples: use a
low
e
r
c
ase "u
s
age:
"
stri
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
c
o
nt
r
ib/fa
s
t-
i
mpor
t
/impor
t
-zip
s
.
py:
use spaces instead
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
cont
r
ib/fast-
i
mport/import-zips
.
py:
f
ix brok
e
n error
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
A
g
uilar
contrib/
f
ast-imp
o
rt: use
a
l
owercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
contrib/credent
i
a
l
:
u
se a low
e
rcas
e
"
usag
e
:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
git-cvs
i
m
p
ort: use
a lowercase "usag
e
:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
gi
t
-cvsimport: u
s
e a lowercase "
u
sage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-
c
v
s
exportcommit: use a lowercase "
u
sage
:
"
s
tri
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
gi
t
-a
r
c
h
i
m
port
:
use a
l
owe
r
case "usa
g
e:"
s
t
rin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-merge-one-file: use a lowerc
a
se "usage:" stri
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git
-
relink: use
a lowerca
s
e
"usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
A
g
uilar
git-svn: use
a
lowercase "u
s
age:"
s
tring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
git-
s
h-s
e
tup: use a
low
e
rcase "usa
g
e
:
" str
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
David
Aguilar
t7
8
00: "defaults"
i
s no lo
n
g
e
r a b
u
il
t
in tool name
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
David A
g
u
ila
r
t7800: modernize tes
t
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-20
D
a
v
id
Aguil
a
r
t7800: update copyright not
i
ce
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-17
David
A
guilar
difftool: silence uninitialized variable warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
D
av
i
d A
g
uilar
p4merge:
f
ix pri
n
tf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
difftool--he
l
per: fix pri
n
tf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
Dav
i
d Aguil
a
r
doc: generate a list of valid merge
tools
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
mergetool--lib:
add fu
n
cti
o
ns for f
i
nding available
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguil
a
r
m
e
rgetool--lib: improv
e
the he
l
p
text in guess_merge
_
tool()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David
Aguil
a
r
mergetool--lib: simplify
command expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
Davi
d
Aguil
a
r
mergetool
s
: simplify h
o
w we han
d
l
e "vim"
and
"d
e
faults"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
m
e
r
getool--lib: improve show_
t
ool
_
help() output
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Aguila
r
merge
t
ools/vim:
r
e
m
ove redun
d
an
t
diff
c
ommand
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
David
A
g
u
ilar
mergetools/p4merge: Ho
n
or $TMPDIR for the /dev/null
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
Da
v
id A
g
uilar
mer
g
etools/p4mer
g
e: Handle "/dev/null
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
D
avid Aguilar
merg
e
tool--lib: Allow custom commands to o
v
erride
built-in
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
D
avid A
g
ui
l
ar
gitk: R
e
name 'tagcont
e
nts' to 'cached_tagconte
n
t'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
Davi
d
A
g
uilar
gitk: Tea
c
h "R
e
read referenc
e
s" to re
l
oad tags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
David Aguila
r
m
e
r
getool,difftool: Docu
m
ent --tool-help consistently
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Da
v
id Aguilar
di
f
ftool: D
i
sable --s
y
mli
n
ks on
cygwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Davi
d
Aguilar
diffto
o
l
: Handle compa
r
e() returning -1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
D
avid Aguilar
difftool: Wr
a
p long lines
for
readability
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
Dav
i
d
Agu
i
lar
diffto
o
l: Check all
r
eturn code
s
from co
m
pare()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
D
a
vi
d
Aguilar
difftoo
l
:
Handle finding m
e
r
g
etools/ in a pat
h
with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
i
fftool: Use
s
ymlinks
when diffing aga
i
nst the
wo
r
ktree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Aguilar
difftool: Call
the te
m
p di
r
ect
o
ry "git-difftool"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d Aguila
r
difftool: Move option va
l
ues into
a ha
s
h
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David
A
guilar
dif
f
tool: Eliminate global var
i
a
b
les
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David A
g
uilar
difftool: Simplify print_tool_help()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
D
avid Aguilar
t
7
800: Test difftool pass
i
ng a
r
guments t
o
d
i
f
f
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David Agu
i
lar
merg
e
tool: Provide an empty file when neede
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David Aguila
r
Makefile: Improve compiler header dependency ch
e
ck
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d
Aguilar
mergetools/meld: Use '--outpu
t
' when
availab
l
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David A
g
u
i
lar
m
e
r
geto
o
l
--lib: Refactor tools into separate
files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vid A
g
u
ilar
mergeto
o
l--lib:
M
ake style consistent with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Ag
u
ilar
difftoo
l
--he
l
per: Make style consistent with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David Agu
i
lar
t/t7503
-
pre-c
o
mmit-hook
.
sh: Add G
I
T_PREFIX t
e
sts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Da
v
i
d
Aguilar
g
i
t-
m
ergeto
o
l
-
-lib: M
a
ke
v
imdiff retain the current
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
a
v
i
d
Aguilar
gi
t
: Remov
e
h
a
ndling for GI
T
_P
R
EFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Agu
i
lar
setup: Provide GI
T
_
PREFIX to built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
submodule sync: Update "submod
u
le
.
<nam
e
>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
David
Aguilar
me
r
getool: S
k
ip auto
r
esol
v
e
d paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
Da
v
id Agui
l
ar
Documentation: Expla
i
n git-
m
erg
e
tool's use of t
e
mp
o
rary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David
Agu
i
lar
Make
f
ile:
Remove usage of deprecated Python "has_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
David
A
g
uilar
difftool: Fix '--gui' when di
f
f
.
guitool is unconfigured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David
Aguil
a
r
t7800-difftool
.
sh: Test mergetool
.
pro
m
p
t fallback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
D
a
vid Aguilar
diffto
o
l: Upda
t
e copyr
i
ght notices
t
o list each year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
difftool: Use eval to ex
p
and '--extcmd' expressi
o
n
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Agu
i
lar
d
i
fftool:
A
dd '-x'
a
nd as an alias for '-
-
extcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguil
a
r
t
7
8
0
0-diffto
o
l
.
sh: Simpl
i
fy t
h
e
-
-
extcmd test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David A
g
uilar
git-di
f
f
.
txt: L
i
nk to git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
avid Agui
l
a
r
difft
o
ol: Allow specify
i
ng unconfigured
c
ommands
with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool--helpe
r
:
Remove use of the GIT_
M
ERGE_
T
OOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
di
f
ft
o
ol--hel
p
e
r
:
U
p
d
a
te copyright and remove di
s
tract
i
ng
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
D
avid
A
g
u
i
l
ar
git-difftool
:
A
dd
'--gui
'
for selecting
a GUI tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
Davi
d
Aguilar
t
7800-dif
f
tool:
S
e
t
a bogus tool for u
s
e
by test
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
help: Do not un
n
ecessarily loo
k
for a repository
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
submodule
.
c: Sque
l
ch a "us
e
befor
e
a
ssignment" warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vi
d
Aguil
a
r
d
i
ff: ge
n
e
r
a
te pre
t
ty filenames
in prep_temp_blo
b
()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
a
v
id Aguila
r
com
p
at: add a basen
a
m
e() compatib
i
li
t
y function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
A
guila
r
co
m
pa
t
: add a
mkstemps() comp
a
tibility
f
u
n
c
tion
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguila
r
Add git-replace t
o
.
gi
t
ignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David
A
guilar
m
ergetool--lib: add support
f
or araxi
s
merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
D
av
i
d Ag
u
ilar
mergetool
-
-lib: specialize dif
f
options
f
o
r eme
r
ge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
merge
t
ool-
-
li
b
: s
i
m
p
lif
y
API u
s
ag
e
by removing mo
r
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguila
r
d
i
ff
t
ool
/
merg
e
too
l
: refactor commands to use g
i
t-mergetoo
l
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguila
r
mer
g
etool:
u
s
e $(
.
.
.
) instead
o
f `backt
i
cks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
bash c
o
mp
l
etio
n
: add git-di
f
ftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
id
Aguilar
di
f
ft
o
ol: add supp
o
rt for a diffto
o
l
.
prompt config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
i
d
Aguilar
d
ifftool: add various git-difftool tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: m
o
ve 'git-difft
o
ol' out of contrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
i
d Aguilar
difftool: add a -y short
c
ut for --no-pr
o
m
pt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
next