repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-remote-mediawiki: use toplevel's Makefile
2013-02-03
D
a
v
i
d
Aguila
r
doc: ge
n
e
rate
a
list of valid merge too
l
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
D
avid
A
guilar
me
r
geto
o
l-
-
lib: add functions
f
o
r fin
d
ing
a
vailable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
D
a
vi
d
Aguilar
mergetool--lib: improve the help text in
g
ues
s
_
merge_to
o
l()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Da
v
id Aguilar
merge
t
ool
-
-
l
ib:
s
implif
y
comm
a
nd
e
x
pressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Dav
i
d Agui
l
ar
mergetools: si
m
plify how we ha
n
d
l
e "vim" and
"
defaults"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
Dav
i
d Aguilar
me
r
g
e
t
ool--
l
ib
:
improve show_tool_he
l
p
() output
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
mergetools/vim: remo
v
e red
u
ndant d
i
ff command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
D
a
vid Aguilar
mergetool
s
/p4
m
e
r
g
e: H
o
nor
$TMPD
I
R for the /dev/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
David Aguilar
mergetools/p4merge: Handle "/dev/null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
D
avid
A
guilar
me
r
getool--lib
:
Allo
w
custom commands to o
v
err
i
de
built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Ag
u
i
l
ar
gitk: R
e
name 'tagcon
t
e
n
t
s'
t
o
'
cached_ta
g
content'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David A
g
uilar
g
itk: Teach "Reread
referenc
e
s" to
r
elo
a
d
tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David Ag
u
ilar
merge
t
ool,difftool: Document -
-
tool-he
l
p consisten
t
ly
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Da
v
id Aguila
r
d
ifftool: Disab
l
e --symlinks on
c
ygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
dif
f
t
ool: Ha
n
dle c
o
mpare() retu
r
nin
g
-1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Agu
i
lar
difftool: Wr
a
p long lines for readability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
Da
v
id Ag
u
ilar
d
iffto
o
l
:
Check all return co
d
e
s
f
r
om c
o
mpare
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguil
a
r
difft
o
ol: Handle find
i
ng mergeto
o
l
s
/ in
a
path with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Ag
u
ilar
difftool: Use
s
ymlinks when
d
if
f
ing again
s
t the
w
orktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
A
guil
a
r
difftool
:
Call the
temp directory "gi
t
-d
i
f
ftool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
i
f
fto
o
l
:
Move opt
i
on valu
e
s
into
a h
a
sh
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
dif
f
tool: Eliminate gl
o
ba
l
variables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Simplify
p
r
int_tool_help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
Davi
d
Aguilar
t7800: Test difftool passing arg
u
me
n
t
s t
o
diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David Aguilar
mergetool: Provide an empty file
when nee
d
ed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
Dav
i
d Agui
l
ar
Makefile: Improve
c
o
m
piler he
a
der dependency
c
heck
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id Aguila
r
mergetools/meld:
U
se '--output
'
w
hen
available
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetool--lib: Refactor tools into separat
e
files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Agui
l
ar
mer
g
etoo
l
--lib: Make st
y
le consis
t
e
n
t
wit
h
git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David
A
g
u
ilar
difftool--helper:
M
ake style co
n
sistent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David
A
g
uilar
t/t7503-pre-com
m
it
-
hook
.
sh:
A
dd GIT_PREFIX t
e
sts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Da
v
id
Aguilar
git-merg
e
tool--lib: Make v
i
mdiff retain
the cu
r
rent
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
avi
d
Agui
l
ar
git: Remove handling for GIT_PREF
I
X
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Da
v
id Aguilar
setu
p
:
Provide GIT_PREFIX to built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
submodul
e
sync: Update "submod
u
l
e
.
<nam
e
>
.
u
rl"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David Aguilar
mergetool: Ski
p
autoresolved paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
D
avid Aguilar
D
o
cumentation: Explain git-merge
t
ool's us
e
of
t
emporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
D
a
vid Ag
u
ilar
Makefile: Remove
u
sag
e
of deprecated P
y
t
h
on
"
h
as_k
e
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David Agu
i
la
r
diff
t
o
o
l
: Fix '--gui' when
d
iff
.
g
ui
t
ool is u
n
configured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David
A
gui
l
ar
t7800-difftool
.
s
h
: Test me
r
getool
.
prompt fal
l
b
ack
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Ag
u
ilar
difftool: Update
c
opyr
i
g
h
t notices to list each year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
difftool
:
U
s
e ev
a
l to
e
xpand '
-
-
e
x
tcmd' expression
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vid Aguila
r
difftool: Add '-x' and a
s
an
alias for '--extcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
i
d
Aguilar
t7800-difftool
.
sh: Simplify th
e
--extcmd test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
git-diff
.
txt: Lin
k
to git-d
i
fftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguil
a
r
d
i
ff
t
ool: Allow s
p
ecifying u
n
configured commands with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Agu
i
la
r
dif
f
too
l
-
-helper: Remove use of the G
I
T
_
MERGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
A
guilar
difftool--helper: Update copyright and
re
m
ove distracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
git-difftool: Ad
d
'--gui' for s
e
lecting
a
G
UI t
o
ol
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
D
a
v
id
Agui
l
ar
t7800-diff
t
ool: Set a bogus tool
f
or use by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David Aguila
r
h
el
p
: Do not un
n
e
cessa
r
ily
l
ook
for a repository
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Ag
u
ilar
su
b
module
.
c: Squelch a "use be
f
ore as
s
ig
n
ment" wa
r
ning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
id Ag
u
ilar
d
i
f
f: ge
n
e
r
at
e
pret
t
y filenames in pr
e
p_
t
emp_
b
lob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d Agui
l
ar
compat: ad
d
a
basen
a
me() compatibility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
Aguilar
c
o
mpat: add a mkstemps()
c
om
p
a
t
ibilit
y
fu
n
ct
i
on
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
id Aguilar
A
d
d git-replace to
.
gitig
n
ore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David Ag
u
i
l
ar
me
r
geto
o
l--lib: add
s
uppo
r
t
for
ara
x
is merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David
A
guilar
mergetool--li
b
: specialize diff optio
n
s for emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David
A
gu
i
lar
mergeto
o
l--
l
ib: simplify AP
I
usage by removin
g
mor
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
di
f
ft
o
ol/mergetool: refactor comm
a
nds to use git-merge
t
oo
l
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
mergetool: use $(
.
.
.
) instea
d
o
f
`backticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
bash c
o
mpl
e
tion: add gi
t
-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
difftool: add suppo
r
t for a difftool
.
prompt con
f
i
g
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: ad
d
v
a
rious git
-
d
i
fftool t
e
sts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
difftool: move 'git-difftoo
l
' out
o
f co
n
tri
b
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid
A
guilar
difftool
:
add a -y
shortcut for -
-
no-promp
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguila
r
di
f
ftool: use
pe
r
l built-in
s
when tes
t
ing for msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
diffto
o
l: remove
t
he bac
k
up file feature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: remove merge options for
o
p
endiff, tkd
i
ff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
Davi
d
Aguilar
everyday: u
s
e the
d
ashless form
o
f
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 separa
t
e
config
namespace for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
D
a
vid Aguil
a
r
contrib/difft
o
ol:
D
on't
repeat m
e
r
g
e
tool candidates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
D
avid A
g
ui
l
ar
difft
o
ol: pu
t
the cur
s
or
on the edita
b
le fi
l
e for Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
Davi
d
A
guilar
difftoo
l
: fix documenta
t
i
on probl
e
ms
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
David Aguil
a
r
contrib: add 'git
d
ifftool' for launching c
o
mm
o
n merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
git-merget
o
ol: prop
e
rly handle "git
m
ergetool -- filename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
D
a
v
id Agui
l
ar
te
s
ts: ad
d
a
testcase for
"
git submodule s
y
nc"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
Dav
i
d A
g
uil
a
r
git-
s
ubmodule: add "sync"
c
ommand
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
D
a
v
i
d
Aguila
r
g
it-sub
m
od
u
le: replace duplic
a
ted code with a module_l
i
st
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David Aguilar
[P
A
TCH] gitk: Don
'
t
show lo
c
al changes w
h
en we
t
here
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree