repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-fast-import.txt: improve documentation for quoted paths
2012-10-11
D
a
v
id Aguilar
mergetools/p4m
e
rge: Ha
n
dle
"
/
dev/n
u
l
l"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David Aguilar
mergetool--li
b
:
Allow
c
ustom
c
ommands to override built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk
:
Rename 'tagc
o
ntents' to
'cached_tagcontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: Tea
c
h "Reread
r
eference
s
" to r
e
load tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
D
a
vid Aguilar
mer
g
e
t
ool,difftool:
Document -
-
tool-help consistently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
a
vi
d
Aguilar
difftoo
l
: Disable --symlinks on cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David
Agui
l
ar
difft
o
ol: Han
d
le co
m
pare()
r
et
u
rn
i
ng -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguil
a
r
di
f
ftool: Wrap long lines
for readabili
t
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
dif
f
tool: Check all
r
eturn codes f
r
om c
o
mpar
e
()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
Davi
d
Aguilar
d
i
fftool: Handl
e
findi
n
g merg
e
t
ool
s
/ in a p
a
th w
i
t
h
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Agui
l
a
r
difftool: Use s
y
mli
n
ks when diffing agai
n
st
the worktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
dif
f
tool: Cal
l
the t
e
mp directory "git-diffto
o
l"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: M
o
ve
o
p
tion
v
alues into a h
a
sh
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Ag
u
ilar
difft
o
ol:
E
l
i
m
in
a
t
e
global v
a
ria
b
l
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Agui
l
ar
d
ifft
o
ol:
Simplify
p
rint_tool_
h
e
lp()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Ag
u
ilar
t780
0
: Test difftoo
l
passing arguments t
o
diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David
A
guila
r
m
e
rgetool: Pr
o
vide an emp
t
y file when
n
eeded
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
Da
v
id Aguilar
Make
f
ile: Improve
com
p
il
e
r hea
d
er dependenc
y
chec
k
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id Aguilar
mergetools/meld
:
U
se '--
o
u
tput' w
h
en
ava
i
lable
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetool
-
-
lib
:
Refactor tools into s
e
p
ar
a
te files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d Aguilar
mer
g
etool-
-
lib:
Make style consistent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d
A
g
u
i
l
a
r
diffto
o
l--helper: Make styl
e
consi
s
tent w
i
th git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
Dav
i
d Aguilar
t
/t7503-pre
-
commit-hook
.
sh: Ad
d
G
IT_PREFIX te
s
ts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
a
vid Agui
l
ar
gi
t
-mergetool--lib: Make
v
i
mdi
f
f r
e
tain the current
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David
A
guilar
git:
R
emove
h
a
n
d
li
n
g for GIT_P
R
EFI
X
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
setup: Provi
d
e
GIT_PREFIX to
bui
l
t-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Dav
i
d
Ag
u
ila
r
su
b
module sync: Updat
e
"submo
d
ule
.
<
n
ame>
.
u
rl"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David Aguilar
m
e
r
g
et
o
ol: Skip autoreso
l
ved paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
Dav
i
d Aguila
r
Documentation: Expl
a
in
git-
m
e
r
g
e
tool's use of tem
p
orary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David Agui
l
ar
Makefile: R
e
move u
s
age o
f
de
p
recated Python "has_
k
ey
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
Da
v
id
A
guilar
diff
t
o
o
l: Fi
x
'-
-
gui' when di
f
f
.
gu
i
too
l
is unconf
i
g
ured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
D
a
v
i
d Agu
i
lar
t7800
-
difftool
.
sh: Te
s
t mergetool
.
prompt
f
allbac
k
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Ag
u
ilar
difftool: Update copyright notices to li
s
t each
y
ear
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Davi
d
Agui
l
ar
dif
f
tool: Use e
v
a
l
to
expand '--extc
m
d' expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Dav
i
d
Aguilar
dif
f
tool:
Add '-x' a
n
d as an alias
f
or '--extcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vid Aguilar
t7800-difftool
.
sh: Si
m
p
l
ify the --extcmd test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Agu
i
l
ar
git-diff
.
txt:
Lin
k
to g
i
t-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Davi
d
Agui
l
ar
d
ifftool: A
l
low specifying
unconfigured c
o
m
man
d
s wi
t
h
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
avid
Aguilar
diffto
o
l--helper:
Remove u
s
e of the GIT_
M
E
R
G
E
_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
id A
g
uilar
difftool--helper: Update
c
o
p
yrigh
t
and rem
o
ve distra
c
ting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
D
avid
A
guilar
git-d
i
f
f
to
o
l: Add
'--gui' for selecting a GUI
t
o
ol
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
D
a
v
i
d Aguilar
t
78
0
0-difftool: Set a
bogus tool f
o
r
u
se by t
e
sts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
help: D
o
n
o
t un
n
ecessarily look fo
r
a r
e
posito
r
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
su
b
module
.
c:
Squelch a "u
s
e before
assignment" wa
r
ning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
avid Aguilar
diff
:
gene
r
a
te p
r
etty filenames in
p
rep_temp_blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d Aguilar
co
m
pa
t
: add
a
b
asename() compatib
i
lity function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
Aguilar
compat: add a mkstemps()
c
ompatibility
function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
Aguil
a
r
Add git-replace to
.
g
i
tignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
mer
g
e
t
ool--lib: add support for araxis merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David Aguilar
merg
e
t
o
ol--lib: specialize
diff options for eme
r
ge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
D
avid Aguilar
mergetool
-
-
l
i
b
: simpli
f
y API usage
b
y removing
mo
r
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
difftool/mer
g
etool: refactor com
m
ands t
o
use
g
it-me
r
getool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id A
g
uilar
mergetool:
us
e
$
(
.
.
.
) instead
of `bac
k
ticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
bash completion:
a
dd gi
t
-
difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
u
ilar
difftool: add support for a
d
i
f
ft
o
o
l
.
prom
p
t config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
di
f
ftool: a
d
d various git-diff
t
ool tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
difftoo
l
: mo
v
e 'git-difftoo
l
'
ou
t
of contr
i
b
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
dif
f
tool: add a -y
s
hor
t
cut fo
r
--
n
o-prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: use
perl bui
l
t
-
ins when te
s
ting for msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
diff
t
ool:
remove the
b
a
ckup file feature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
i
d
Agui
l
a
r
difftool: remo
v
e
merge options for ope
n
diff,
t
kdi
f
f
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
Dav
i
d
Aguilar
everyday: use the das
h
l
e
ss form of g
i
t-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
Da
v
id Aguilar
contrib/difftool: use a separate con
f
ig namesp
a
ce for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
Dav
i
d Aguila
r
contrib/
d
ifft
o
ol: Don't repeat
m
erge tool
c
andi
d
ates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
Davi
d
Agui
l
ar
difftool: put
the cu
r
sor on the editable file for
Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
difftool: fix
doc
u
mentation pr
o
b
l
ems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
Davi
d
Aguilar
c
o
ntrib: add 'git dif
f
tool
'
fo
r
launchi
n
g c
o
mmon merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
git-mergetool: properly handle "git mer
g
etool -
-
filename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
David Aguil
a
r
t
es
t
s
: add
a
testca
s
e for "
g
it submodule sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
Da
v
id Aguilar
g
it
-
sub
m
odule: add "sync"
comma
n
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
Dav
i
d Aguil
a
r
git-s
u
bmodule:
r
e
place duplicated code
w
ith a mod
u
le_list
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David Aguilar
[PAT
C
H] gitk:
D
o
n
'
t show loc
a
l changes when
w
e
there
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree