repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
checkout: reorder option handling
2012-08-10
David Aguila
r
m
ergetoo
l
,difftool:
D
o
cument --tool
-
h
e
l
p
con
s
is
t
ently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Agu
i
lar
difftool: D
i
sable
-
-s
y
ml
i
nks on cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Dav
i
d A
g
uilar
difftoo
l
: Handle c
o
mpare(
)
returning -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David
Aguilar
difft
o
ol:
W
r
a
p long lines for readab
i
lity
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difftool: Check all r
e
turn co
d
es from c
o
m
pa
r
e()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
Davi
d
Ag
u
ilar
difftool
:
Handle finding mergetools/
in a p
a
th
w
ith
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
di
f
fto
o
l: Use
s
ymli
n
ks whe
n
d
i
ffing
a
ga
i
nst
t
he worktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
i
d
Ag
u
ilar
d
i
fft
o
ol: Ca
l
l the temp directory "git-diff
t
ool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
A
guilar
difftool: Move option values into a hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Aguilar
difftool: Eliminate global variables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d Agu
i
lar
d
i
fftool
:
Simplify pri
n
t_tool_help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Ag
u
i
lar
t7800: Test difft
o
o
l
passing arguments to di
f
f
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David
Aguilar
mergetool: Provide
a
n
empty file when need
e
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David Aguilar
M
akefile: Improve co
m
pile
r
header d
e
p
ende
n
cy che
c
k
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d Aguilar
m
ergetools/meld: Use '
-
-
o
u
t
put'
w
hen
a
vailable
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
i
d
Aguilar
me
r
getool--lib: Refactor
t
ools into s
e
parate
f
iles
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
avi
d
Aguilar
m
er
g
etool--li
b
:
M
ake style
consis
t
ent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
d
ifftool--helper:
Make style cons
i
stent wit
h
git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David Agu
i
lar
t
/
t750
3
-pre-commit-hook
.
s
h
: Add
GIT_PR
E
FIX
t
ests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
a
vid Ag
u
ilar
git-mer
g
etool--lib: M
a
ke vimdif
f
retai
n
the current
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Davi
d
Aguilar
git: Re
m
o
v
e handli
n
g
f
or G
I
T
_
PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Agui
l
ar
setup: Provide
GIT_PREFIX to b
u
ilt-
i
ns
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Davi
d
A
g
u
i
lar
submod
u
le sync:
U
p
date "submodule
.
<na
m
e>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David Aguilar
m
e
rg
e
tool: Skip autoreso
l
ved paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
D
a
vid
A
guilar
Document
a
tion: Explain git-mergeto
o
l's u
s
e of tempo
r
ary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David Ag
u
ilar
Makefile:
R
emove usag
e
o
f
deprecated Python "has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
Davi
d
A
guilar
difftool: Fix '--g
u
i
'
when diff
.
g
uitoo
l
is unconfig
u
red
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
D
av
i
d Ag
u
ilar
t780
0
-difftool
.
sh: Tes
t
mergetool
.
prompt fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
D
a
vid
A
guilar
dif
f
tool
:
Update
c
opy
r
ight notices to list ea
c
h
ye
a
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David A
g
uila
r
diff
t
ool: Us
e
ev
a
l
t
o ex
p
a
n
d
'
-
-ex
t
cmd' expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
id Aguilar
difftool:
Add '-x' an
d
as
a
n alias
fo
r
'--ex
t
cmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
t
7
800-dif
f
tool
.
sh: Simpli
f
y the
--extcmd test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David A
g
uilar
g
i
t-diff
.
txt: Li
n
k
to git-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
avid Aguilar
difftool: Allow specifying unconfigu
r
ed
c
ommands with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid Agui
l
ar
difftool--helper: Remove
use of the
GIT_ME
R
GE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
avid
Agui
l
ar
d
i
fft
o
ol--helpe
r
: Upda
t
e c
o
pyright an
d
r
e
move distracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David
A
g
u
ilar
git-dif
f
tool
:
Add '--gui'
for selecting a G
U
I tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguil
a
r
t
7
800-d
i
fftoo
l
: Set a bogus t
o
ol for use
b
y tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
Dav
i
d A
g
uilar
help: Do not unnecessarily loo
k
f
o
r a re
p
osito
r
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
s
ub
m
odule
.
c: S
q
uelch a "use
b
efo
r
e assignme
n
t" warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguil
a
r
di
f
f: gen
e
rate pr
e
tty filenames in
prep_temp_blob(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid Aguilar
compat: add a basename
(
)
compat
i
b
i
l
ity function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat: add
a
mkstemps() compatibility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
Agu
i
l
a
r
Add git-replace to
.
gitignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
D
a
v
i
d Aguilar
mergetoo
l
--lib: add
support for ar
a
x
i
s merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David Aguilar
merget
o
ol--lib: speciali
z
e d
i
ff
o
ptions
for
emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David
A
gui
l
ar
mergetool--lib: simplify API
usage b
y
removing more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
g
u
ilar
d
i
fft
o
o
l
/mergetool
:
refactor commands to
u
se git
-
merge
t
ool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
mergetool: use
$
(
.
.
.
) in
s
tead of
`
back
t
icks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
bash
completi
o
n: add git-di
f
ftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
a
r
difftool: add supp
o
rt
fo
r
a dif
f
tool
.
prompt
con
f
ig
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: add various
git-difftool tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
difftool
:
move '
g
it-difftool
'
o
u
t of contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
di
f
ftool: a
d
d a -y shortcut for -
-
no-prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguil
a
r
difftool: use perl built-ins
w
hen tes
t
ing for msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
diffto
o
l: re
m
ov
e
the ba
c
kup fi
l
e fe
a
ture
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diffto
o
l:
r
e
m
ove merge opt
i
ons for opendiff,
t
kdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
David Agui
l
a
r
everyday: use the dashless form of
g
it-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David A
g
uilar
contrib/difftool:
use
a sepa
r
ate config
namespac
e
for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
Davi
d
A
guil
a
r
contrib/d
i
ff
t
ool
:
Don't
repea
t
merge tool
c
an
d
idat
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
Davi
d
Aguil
a
r
d
i
f
ftool: put
t
h
e curs
o
r
on the e
d
itable fi
l
e for Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
diff
t
ool
:
fix docu
m
enta
t
ion
p
roblems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
D
a
vid Aguil
a
r
c
ontrib:
a
dd 'git d
i
fftool' for
l
a
u
n
c
h
ing common merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
Davi
d
Aguilar
git-merg
e
to
o
l:
properly handle "git mergetoo
l
-
-
filen
a
me
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
David
Ag
u
ilar
tests: add
a te
s
tcase f
o
r "gi
t
submodule
s
ync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
David A
g
uilar
git-submodul
e
:
a
d
d
"
s
ync" command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
David
A
guilar
gi
t
-
su
b
module
:
replace du
p
l
ic
a
t
e
d cod
e
with a module_list
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David Aguilar
[PATCH] g
i
tk: Don't show local change
s
w
h
en we the
r
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree