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
difftool: Move option values into a hash
2012-07-23
David Aguilar
difftool: Move option
values into a hash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
di
f
f
too
l
: Eliminate g
l
obal variables
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
avid Aguil
a
r
d
ifftool: Simplif
y
print_too
l
_help()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
Da
v
id
A
guil
a
r
t7800: Test
difft
o
ol passing arguments to diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David Aguil
a
r
me
r
getool: Provi
d
e an empty file whe
n
nee
d
ed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David Aguilar
M
akefile: Impro
v
e comp
i
ler header dependency check
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vid Aguil
a
r
m
e
rg
e
tools/
m
eld: Use '--output' when available
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id Aguilar
m
ergeto
o
l-
-
l
i
b: Re
f
actor tools in
t
o separate
f
i
les
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
avid Aguilar
mergeto
o
l--lib: Make style consistent with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
difft
o
ol--he
l
p
e
r: Make
s
tyle consis
t
ent with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
Dav
i
d Aguilar
t/
t
7503-pre-commit-hook
.
sh: Add GIT
_
P
R
EFIX tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git-mergetool--lib
:
Ma
k
e vi
m
di
f
f
ret
a
in the
cu
r
re
n
t
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
avid Aguil
a
r
git: R
e
move h
a
ndl
i
ng for
G
I
T
_PREFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
setup: Provide GIT_PREFIX t
o
built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
subm
o
dule sy
n
c: Update "submodule
.
<name>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
David
A
guilar
mergetool: Skip autoresolved paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David Ag
u
ilar
Documentation: Explain git-mergetool's use of
t
e
mporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David Aguilar
Makefile:
R
emov
e
usage of deprecat
e
d Python "has_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
David Aguila
r
difftool:
F
ix '--gui' wh
e
n dif
f
.
guit
o
ol is un
c
onfigured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t7
8
0
0-dif
f
t
o
o
l
.
sh: Test mergeto
o
l
.
prompt
fall
b
ack
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
Dav
i
d
Agui
l
ar
d
ifftool: Update copyright notices to list each ye
a
r
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David
A
guilar
difftool:
U
se eval to expand '--extcmd
'
expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Davi
d
Aguilar
di
f
f
tool: Add '-x' and as an alias for '--extcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
id A
g
uilar
t7
8
00-difftool
.
s
h: Simp
l
ify the --extcmd test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d Aguilar
git-diff
.
txt: Li
n
k t
o
gi
t
-
d
ifftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool:
A
l
low spec
i
fying unc
o
nfigured comman
d
s with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Agui
l
ar
difft
o
ol-
-
helper: Re
m
o
v
e use of
t
he GIT_
M
ERGE
_
TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
i
d Aguilar
d
i
f
ftool--
h
elper: Up
d
ate copyrigh
t
a
n
d remove distracting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
D
avid Aguil
a
r
git-difftool:
A
d
d '--gui
'
for selecting a G
U
I
tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
t
7
80
0
-difftool: Set a bogus
t
ool for use by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
h
e
lp: Do not
u
nnecessarily loo
k
for a r
e
pository
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
s
ubmodule
.
c: Sq
u
elch a "use before a
s
signment" warni
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
d
i
f
f: generate pretty
filenames in prep
_
temp
_
blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat:
add a basename() c
o
mpatibility function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
c
ompat:
add a mkstemps(
)
compatibi
l
ity func
t
ion
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
A
gui
l
ar
Add git-
r
e
p
lace to
.
g
it
i
gnore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David Ag
u
ila
r
mergetool--lib: add support f
o
r araxis merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David
A
guilar
mergetool--lib:
s
pecializ
e
diff optio
n
s for emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David A
g
u
i
l
a
r
mergetool--lib:
simplify A
P
I usage by remo
v
i
n
g more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
dif
f
tool/m
e
rgeto
o
l: refactor com
m
ands to use git-mer
g
etool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid A
g
ui
l
ar
mergetoo
l
: use $(
.
.
.
)
in
s
tead
o
f `backticks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
bash completion: ad
d
g
it-di
f
ftoo
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
di
f
ftool: add support f
o
r a difftool
.
p
rompt config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
di
f
ftool: add various git-difftool
t
ests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difft
o
ol: move 'git-diff
t
ool' out of cont
r
i
b
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
g
uilar
difftool: add
a
-y
s
hortc
u
t
f
or --n
o
-
prompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
dif
f
tool: u
s
e perl built-ins when testing
f
o
r
m
s
ys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool
:
remove the backup file
feature
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Agui
l
ar
difftool: remov
e
m
erge options for ope
n
diff, tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Agu
i
lar
everyday:
u
s
e
the
d
a
shless form of
git-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
David Aguilar
contrib/difftool: use
a s
e
pa
r
ate config namespace
f
or
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
D
a
v
id
Aguilar
contrib
/
dif
f
tool
:
Don't repeat mer
g
e
tool candidate
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
difftoo
l
: put the cursor on
t
he edit
a
ble file for
V
im
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguila
r
diffto
o
l
:
fix documentat
i
on proble
m
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
David Aguilar
contr
i
b: add 'git difftool'
for launchin
g
common
m
erge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Ag
u
ilar
g
i
t-m
e
rge
t
ool
:
properly
handle "git mergetool
-
- filename"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David Aguila
r
tests: add a testcase for "git submodule
s
ync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
David Agu
i
lar
git-
s
ubmodule: add "sync"
comm
a
nd
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David Aguil
a
r
git-
s
ubmodule:
replace duplicated code with a module_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
Davi
d
Aguil
a
r
[PATCH] g
i
t
k: Don't show local changes when
we
there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree