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
git-merge-one-file: use a lowercase "usage:" string
2013-02-24
D
avid
Aguil
a
r
g
i
t-merge-one-
f
i
le: use
a
l
o
wercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
A
g
uilar
git-relink: use a lowerc
a
se
"usage:
"
stri
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
git-s
v
n
: use a low
e
rcase "usage:" strin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vi
d
A
gu
i
l
a
r
g
i
t-sh-setup:
use a lowe
r
c
ase "u
s
ag
e
:" str
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
Davi
d
A
g
uilar
p4merge: fix printf
u
sage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
Da
v
i
d Aguilar
difftool--h
e
l
per: fix
p
ri
n
tf u
s
a
g
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David A
g
u
ilar
doc: g
e
nerate a l
i
st of val
i
d merge tools
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
D
avid Agui
l
a
r
m
e
rgetool--lib: add functions for find
i
ng
a
vailable
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David
A
guilar
mergetool-
-
l
ib: improve t
h
e
help tex
t
i
n
gu
e
s
s
_merge
_
tool(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David
A
guilar
m
ergetool--lib:
s
implify command exp
r
essions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David
A
gui
l
ar
mer
g
etools: simplify how we handle "vim" and "d
e
faul
t
s"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
Davi
d
Aguila
r
mergetool--
l
ib: improve show_tool_help()
o
utput
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
mergetool
s
/vim:
r
emove redundant
d
i
ff co
m
mand
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
David Aguilar
m
ergetool
s
/p
4
me
r
ge: Honor $TMPDIR f
o
r the /d
e
v/null
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
David Agu
i
lar
mergetools/p
4
merge: Handle "/
d
ev/null"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
D
a
vid Agu
i
lar
merg
e
t
o
ol-
-
lib: A
l
low custom commands to ov
e
rride built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Ag
u
ilar
gitk: Rename
'
tagcontents' t
o
'cached_tagcontent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
Davi
d
Ag
u
i
lar
gitk: Tea
c
h "Reread referenc
e
s" to reload tags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
Dav
i
d
A
guilar
mergetool,diffto
o
l: Docume
n
t
-
-
tool-he
l
p
con
s
i
s
tently
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Ag
u
il
a
r
d
i
fftool: Disabl
e
--s
y
mlinks
o
n cygwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Agui
l
ar
difftool: Handle compare
(
) re
t
urni
n
g -1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool
:
W
rap long lines for readability
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difftool:
C
heck all return codes
f
rom compare()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
D
avid A
g
uilar
difftool: Handle
fi
n
d
ing mergeto
o
ls/ in a
p
a
t
h with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool:
Use symlinks when d
i
f
fing
agai
n
st the worktree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
a
v
i
d Aguilar
difft
o
ol: Call the t
e
mp directory "git-difftool"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Agui
l
ar
difftool
:
Move option value
s
into a has
h
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: E
l
im
i
nate global var
i
ables
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d Aguilar
di
f
ftoo
l
: Simplif
y
print_t
o
ol_help()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
David Aguilar
t7800
:
T
est difftool pas
s
ing
arg
u
ments t
o
diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David Aguilar
mer
g
eto
o
l: P
r
ovide an empty f
i
l
e
when needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David Aguilar
Makefile
:
Improve
c
ompiler header dependen
c
y check
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mer
g
eto
o
ls/
m
eld: Use '-
-
output' when av
a
ilable
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
merget
o
ol--l
i
b: Refactor tools into separate fi
l
es
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
avid Aguilar
mergetool--li
b
: Make s
t
yle consisten
t
wi
t
h
git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d Aguilar
difftool--
h
elper: Make style consistent w
i
th git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David Aguil
a
r
t/t7503-
p
re-commit-hook
.
s
h
: Add GIT_PRE
F
IX tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git-mergetool--l
i
b: Make vi
m
diff retain the c
u
rr
e
nt
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
a
vid Aguilar
git: Remove handling
for
GIT_P
R
EFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Ag
u
ilar
setup: Prov
i
de GI
T
_PRE
F
I
X
t
o b
u
ilt-in
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
s
ubmo
d
ule
sync:
Update "submodule
.
<name>
.
url
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
David Aguilar
m
e
r
getool:
Skip autore
s
olved path
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David Aguil
a
r
Documentation
:
Explain git-mer
g
etool's
use
of
temporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David Aguilar
M
a
kefile: Remove
u
sage of
d
epre
c
ated Pytho
n
"has_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
Da
v
id
Aguilar
d
i
f
ftool: Fix
'--gui' when diff
.
guito
o
l i
s
unconfigure
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
D
a
vi
d
A
g
uilar
t
7
8
00-diffto
o
l
.
sh: T
e
s
t
mergetool
.
promp
t
fallb
a
ck
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
difftool: Update
copyrigh
t
n
o
ti
c
es to list each ye
a
r
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
id Aguilar
difftool: Use eval to expand '--extcmd'
e
x
pressio
n
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David A
g
uila
r
d
ifftool: Add '-x'
an
d
as
a
n
a
l
ias
for '--
e
xtcm
d
'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Agu
i
lar
t7800-difftoo
l
.
sh:
Simplify t
h
e
-
-extc
m
d test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
a
v
id Aguilar
g
i
t-d
i
f
f
.
txt: Link to gi
t
-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguil
a
r
difftool: All
o
w specif
y
ing unconf
i
g
u
re
d
comman
d
s with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David
A
guilar
difftool-
-
h
e
lpe
r
: Remove use of t
h
e G
I
T_MERGE_
T
OOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
d
i
f
ftool--helper: Update copyright and remo
v
e distracting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Ag
u
ila
r
g
i
t
-difftool: Add '--gui' for sel
e
cti
n
g
a GUI
tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
D
a
vid Aguilar
t7800-difftool:
Set a
bogus tool for use
b
y tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
Davi
d
Aguilar
he
l
p: Do not unne
c
essarily
l
oo
k
f
or
a r
e
pository
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
D
a
vid A
g
uilar
s
u
b
m
odu
l
e
.
c: Squelch a "use before as
s
ig
n
ment" w
a
rning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vi
d
Aguilar
diff: generate pretty
file
n
a
m
e
s in prep_temp_blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
avid
A
guilar
com
p
at: add a basename() c
o
mpatibility
functio
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
avid Agui
l
ar
compat: add a
m
kstemps
(
) compatibility func
t
ion
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Agui
l
ar
A
dd git-replace to
.
g
i
tignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David Ag
u
i
l
ar
merget
o
ol
-
-
l
ib: add
support for ara
x
is mer
g
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David
A
gui
l
a
r
me
r
g
et
o
ol--lib: specialize
d
i
f
f options for emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
mergetool--
l
ib
:
sim
p
lif
y
AP
I
usage
by re
m
oving mor
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguil
a
r
d
i
fftool
/
mergetool: refact
o
r co
m
mands to use git-mergeto
o
l
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
mergetool: use $(
.
.
.
) instead of `backtick
s
`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
bash
completio
n
:
add
g
it-diff
t
ool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
difftool: add supp
o
rt
f
or a difftoo
l
.
pro
m
pt
con
f
ig
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid
A
g
uil
a
r
d
i
f
f
t
ool: add various gi
t
-di
f
fto
o
l tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: move 'git-dif
f
tool' ou
t
of c
o
ntri
b
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
difftool: add a -y shortcut for --no-pro
m
pt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id
A
guilar
di
f
f
t
ool: use perl bui
l
t-ins
when testing for m
s
ys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
i
d Agui
l
a
r
difftool: remo
v
e
the b
a
c
kup f
i
le f
e
at
u
re
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool
:
remove
m
er
g
e
optio
n
s f
o
r opend
i
ff, tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
D
av
i
d A
g
ui
l
ar
everyday
:
use t
h
e
d
ashl
e
ss form of
git-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
David Aguilar
contr
i
b/di
f
ftool: use a s
e
p
a
rat
e
config
n
amespace f
o
r
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David Aguilar
contrib/difft
o
ol
:
Don't rep
e
at merge too
l
candidates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
difftool: put
t
he cursor o
n
the edit
a
ble file for Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguil
a
r
difftool:
f
ix documentation
p
roblems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
David Aguilar
c
ontrib: add 'git difftool' for l
a
unching common merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
Dav
i
d Agui
l
ar
git-me
r
geto
o
l:
p
roperly handle
"git merge
t
ool
-
- f
i
l
e
name"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David
Aguilar
test
s
: add a testcase for "gi
t
submodule
sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
David
A
guilar
git-su
b
mod
u
le
:
add "s
y
nc" com
m
and
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David Aguilar
git-s
u
b
m
odule: re
p
lace du
p
licated
c
ode wit
h
a
m
o
dule_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
David Ag
u
i
lar
[PATCH] g
i
tk: Don
'
t show l
o
c
a
l
ch
a
nges when we t
h
ere
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree