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
mergetools/p4merge: Handle "/dev/null"
2012-10-11
Da
v
id
A
guilar
mergetools/p4me
r
g
e
: Handle "/dev/null"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: R
e
n
a
m
e 'tagconten
t
s
'
t
o
'cac
h
ed_tagcontent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: Te
a
ch "Reread r
e
ferences" to
r
eload t
a
gs
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
David A
g
uilar
t7800: Test di
f
f
t
oo
l
passing arguments to diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
Da
v
i
d
A
guila
r
mergetool
:
P
r
o
vide an empty fi
l
e when needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
D
a
vid
Aguilar
Makefile: Improve compiler he
a
de
r
de
p
endency check
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David A
g
uilar
mergetools/
m
eld: Use '--output'
whe
n
available
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id Ag
u
ilar
m
e
rgetool-
-
l
ib: R
e
factor tools
i
nt
o
s
e
parate fil
e
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David
Aguilar
mergetool--
l
i
b
: Make style consistent with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id
Aguilar
diff
t
o
o
l--helper:
Make style co
n
s
i
stent
with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David Aguilar
t/t7503-pre-commit-hook
.
sh: A
d
d
GIT_PRE
F
IX
t
e
s
t
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Davi
d
A
guila
r
git
-
merget
o
ol--lib: Make vimd
i
f
f retain the c
u
r
r
ent
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David A
g
u
i
l
ar
git: Remove ha
n
dling
for GIT_PRE
F
I
X
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
s
e
tup
:
Prov
i
de GI
T
_
PREFI
X
to bui
l
t-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David
A
guilar
submo
d
ule sync:
U
pdate "
s
ubmodul
e
.
<na
m
e>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
David Aguilar
me
r
get
o
ol:
S
kip autoresolve
d
paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
D
a
vid Aguilar
D
ocument
a
tion: Explain git-me
r
getool's use
of temporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
Da
v
id Aguilar
M
akefile: R
e
move usage
of depr
e
cated Python "has_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
David
A
g
u
i
lar
dif
f
tool: Fix '--gu
i
' when
diff
.
guit
o
ol i
s
u
n
configu
r
ed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
Da
v
id
A
guila
r
t7800-diffto
o
l
.
sh: Test me
r
ge
t
ool
.
pr
o
mpt fallba
c
k
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
Da
v
id
Ag
u
i
l
ar
d
i
fft
o
ol
:
U
pda
t
e copyright no
t
ices t
o
list each year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
d
ifft
o
ol:
U
s
e
eval to
e
xpan
d
'--extcmd' expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
difftool:
Add '
-
x'
and as an alias for '--extcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Agui
l
ar
t
78
0
0-di
f
ft
o
ol
.
s
h
:
Simpli
f
y the --
e
xt
c
md
test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
git-diff
.
txt:
Link to gi
t
-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftoo
l
: Allow sp
e
cifying unconfigured commands with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Agui
l
ar
difftool--he
l
per: Remove
u
se of the GIT_MER
G
E_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
diff
t
o
o
l--hel
p
er: Update copyri
g
h
t and re
m
ove di
s
tractin
g
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
git-difft
o
ol: A
d
d '--gui' for selecting
a GUI tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
t7800-difftool:
Set
a
bogus t
o
ol for
use b
y
t
e
sts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
Davi
d
Ag
u
i
la
r
h
e
lp:
D
o
n
ot unnecessarily look for a reposi
t
ory
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
s
ubmodule
.
c: Squ
e
lch a "us
e
before ass
i
gnmen
t
"
wa
r
ni
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
id Aguilar
d
iff: generate p
r
e
t
ty f
i
lenames in prep_
t
emp_blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Agui
l
ar
compat: add a basename()
compatibilit
y
function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
A
gu
i
lar
compat:
a
dd a mk
s
temps(
)
c
o
mpa
t
ibil
i
ty fun
c
tion
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguil
a
r
Add g
i
t
-replace to
.
gitignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
mergetool--lib: add support
f
or ar
a
x
is merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David Aguilar
mergetool
-
-lib: specialize diff op
t
ions fo
r
emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David
A
g
uilar
merg
e
tool--lib: simplify
AP
I
us
a
ge by rem
o
ving more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool/mergetool
:
refactor
comm
a
nd
s
to use git-mergetoo
l
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
merge
t
ool: use $(
.
.
.
) instead of `backticks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguil
a
r
bash completion:
a
d
d git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
difftool
:
add suppo
r
t for a difftool
.
prompt
c
on
f
ig
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diffto
o
l: add va
r
i
ous git-d
i
fftool tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
diffto
o
l: move '
g
it-di
f
ftool' out of cont
r
i
b
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: ad
d
a -y
shortcut fo
r
--no
-
p
r
o
mpt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
di
f
ftoo
l
: use perl built-ins w
h
e
n
te
s
ting for msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: remove the
b
ackup file featu
r
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Agui
l
ar
d
i
f
ftool: remove merge options
f
or opend
i
ff, tk
d
iff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David
A
gui
l
ar
eve
r
y
d
ay:
u
se the
d
ashle
s
s f
o
rm of git
-
ini
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
David Agui
l
ar
contrib/difftool: use a
s
e
par
a
te config namespace for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David
A
gui
l
ar
contri
b
/d
i
ffto
o
l: Don't
repe
a
t m
e
rge
tool
candidates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
Da
v
id Aguilar
difft
o
ol: put t
h
e cu
r
sor on the e
d
it
a
ble file
f
or Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
D
av
i
d Aguilar
diff
t
ool: fix doc
u
mentation pro
b
lems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
David
Ag
u
ilar
contrib: add 'git
difftool' for lau
n
ch
i
ng commo
n
merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
D
a
vid Aguilar
g
it-mergetool: properl
y
handle
"
git mergetool -- fil
e
name"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David Aguilar
tests: add
a
test
c
ase for "
g
it submodule
sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
David
Aguil
a
r
git-
s
ubmodule
:
a
d
d
"syn
c
" command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
D
avid
A
g
ui
l
ar
g
it-
s
ubmodu
l
e:
r
epl
a
ce duplicated code with a modul
e
_l
i
s
t
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
David Ag
u
ilar
[PAT
C
H] gitk: Don't show local
c
hanges when we there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree