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
git-cvsimport: use a lowercase "usage:" string
2013-02-24
D
avid Aguilar
git-cvsi
m
port:
u
s
e a lowercase "usage:" st
r
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
g
i
t-cvsexportc
o
mmit: use a lower
c
a
se "
u
sage:" stri
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
i
t
-a
r
c
himport: use a lowe
r
case "usage:
"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
git-merge-one-file: use a lo
w
er
c
ase "usage:" st
r
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
it-relink: use
a
lowercase "usage:
"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d A
g
uilar
git-svn: use
a
lo
w
ercase "usage:
"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-sh-setup: u
s
e a lowercase "usage:
"
s
t
r
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
D
avid Aguilar
p4
m
erge: fix printf us
a
ge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
D
a
vid Agu
i
lar
difftool--helper: fix printf u
s
a
g
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
doc:
gener
a
te a list of v
a
l
i
d
merge too
l
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
D
a
v
id Aguilar
mergetool--lib: add
functions for finding available
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
D
a
v
i
d Aguilar
m
e
rget
o
ol--lib: improv
e
t
h
e
help text in g
u
ess_merge_tool()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David
A
guilar
mer
g
et
o
ol
-
-lib: simplify
command expressi
o
ns
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
m
erg
e
tools: simp
l
ify how we handle
"vim" and "
d
efau
l
t
s"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David
A
guila
r
m
e
rgeto
o
l--lib: i
m
pr
o
ve show_tool_help
(
) outp
u
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
mergetools/vi
m
:
r
e
m
ove
r
edund
a
nt
diff com
m
and
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
David
Aguilar
mergetools
/
p
4merge:
Honor $TMPDIR for the /dev/null
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
Davi
d
Aguil
a
r
merget
o
ols/p4merge:
H
a
n
d
le
"
/dev/null"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
David Aguilar
m
e
rgetool--l
i
b: Allo
w
custom commands
t
o
override built-in
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
D
a
vid Aguil
a
r
gi
t
k: Re
n
ame 'tag
c
o
nt
e
n
t
s
' to
'cached_tag
c
ontent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
Da
v
i
d
Aguil
a
r
gitk
:
Tea
c
h
"
Reread references"
t
o reloa
d
tags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
David Aguilar
m
ergetoo
l
,difftool: Document --t
o
ol-h
e
lp consisten
t
l
y
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Da
v
id
A
guila
r
difftool: Disable -
-
s
y
m
li
n
ks on
cy
g
win
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool
:
Handl
e
compare() returning
-
1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David
A
gu
i
l
a
r
difftool: Wr
a
p
long lines for readability
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
Davi
d
Aguilar
difftool: Check all
r
eturn co
d
es from compar
e
()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
Da
v
id Aguilar
difftool: Handle findin
g
m
e
rgetools/ in a p
a
th
w
ith
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
a
v
i
d Aguilar
difftool: Use s
y
mlinks when diffing aga
i
n
s
t the
w
orktree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: C
a
ll t
h
e tem
p
directory "git
-
d
i
fftool"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
ifftool: Move option value
s
into a hash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
i
d
Aguilar
difftoo
l
: Elimi
n
ate g
l
o
bal var
i
able
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
avid A
g
uilar
di
f
ftool: Simplify print_tool_help
(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
D
a
vid Aguilar
t
7800: Te
s
t difftool passing arguments to
d
iff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David Aguilar
m
ergetool:
Pr
o
vide an empty file when nee
d
ed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
Dav
i
d Aguilar
M
a
kefi
l
e: Improve
c
ompil
e
r h
e
ader dependency chec
k
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguil
a
r
mergetools/
m
eld: Use '--output' when available
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id Aguilar
mergetool--lib:
Refactor tools
i
nto
se
p
arate fi
l
es
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David
A
guilar
mergetool-
-
lib: Make
s
tyle co
n
sistent
w
ith git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David A
g
uilar
difftool--helper: Make style
co
n
sistent with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David
A
guil
a
r
t/t
7
503-pre-commit-hook
.
sh
:
Add GIT_PRE
F
I
X tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
g
it-merget
o
ol--li
b
: Make vimdiff re
t
a
in the cu
r
rent
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Agu
i
lar
git: Remo
v
e
handling
f
or GIT_PREFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
setup: Prov
i
de GIT_
P
REFIX to built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Davi
d
Aguilar
submodule sync:
U
pda
t
e "submodule
.
<nam
e
>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
David Aguilar
mergetool: S
k
ip a
u
tor
e
s
ol
v
ed paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David Aguila
r
Documentatio
n
: Explain git-merge
t
ool's use of
t
em
p
or
a
ry
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David Agu
i
lar
Makefile: Re
m
o
v
e usage of dep
r
ecated
P
ython "has_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
D
a
vid Aguilar
difftool: Fix
'
-
-
gui' when
d
iff
.
guitool is unconfigured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t
7800-d
i
fftool
.
s
h:
Test mergetool
.
prompt fallback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David Aguila
r
difftool: Update copyright n
o
tices to
list each
year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
difftool: Use
e
val to expand '--extcm
d
' ex
p
r
e
ss
i
ons
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
i
d
Aguilar
diff
t
o
o
l
:
Add '-x' an
d
a
s an alias for '--extcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Dav
i
d Aguilar
t78
0
0-
d
i
ffto
o
l
.
s
h
:
Simplify the --extcmd test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
gi
t
-diff
.
txt:
L
ink to git-d
i
f
ft
o
ol
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool: Al
l
ow specifying unconf
i
gured commands wit
h
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool--he
l
per: Remove us
e
of the GIT_MERGE_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool--
h
elper: Up
d
ate copyri
g
h
t
and remove distracting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
git
-
diffto
o
l: Add '--gui' for se
l
ecting a GUI
tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
t7800-d
i
ff
t
ool
:
Set a
bogus
t
ool fo
r
use by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
Dav
i
d A
g
uilar
h
e
lp: Do
not un
n
e
cessari
l
y look
for a repo
s
itory
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
Da
v
id A
g
uilar
su
b
module
.
c: Sq
u
elch a "use before
a
ssignment
"
warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
avid
A
guila
r
diff: ge
n
erate
p
rett
y
filena
m
e
s
in prep_temp_blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
c
o
m
pat:
a
dd a basena
m
e() co
m
patibilit
y
f
u
nction
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Agu
i
lar
compat: add
a mkstemps()
compatibilit
y
f
u
n
c
tion
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
id Aguilar
Add git-repl
a
ce to
.
gitignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
Davi
d
A
guilar
merg
e
tool--lib: add
s
uppo
r
t f
o
r ara
x
i
s merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
Dav
i
d Aguilar
mergetool--l
i
b:
specializ
e
diff optio
n
s fo
r
e
merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
D
a
vid Aguilar
merget
o
o
l--li
b
: simplify API
u
sage by
r
emoving more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Ag
u
ila
r
difftool/mergetool: refac
t
o
r
c
o
m
m
ands to
us
e
git-merge
t
ool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
mergetool: use $(
.
.
.
)
i
nste
a
d of `
b
ackticks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
bash comp
l
et
i
o
n
:
a
dd git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool:
add sup
p
ort for a difft
o
ol
.
p
r
omp
t
config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Agui
l
ar
difftool
:
a
dd
var
i
ous git-
d
i
f
ftool tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diffto
o
l
: move
'
g
it-dif
f
tool' o
u
t
o
f contrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
di
f
ftool
:
add a -y
s
hortcut
fo
r
--n
o
-prompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diffto
o
l: use perl
b
uilt-i
n
s
w
h
en testing for m
s
ys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
diff
t
ool: remo
v
e
the backup
file feature
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
difftool:
r
emove merge options for opendiff,
t
k
d
iff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Aguilar
ev
e
ryday
:
use the dashless fo
r
m of git-ini
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
David Aguilar
contri
b
/difftoo
l
: use a
s
e
parate
config namespace f
o
r
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David A
g
uilar
contrib/d
i
fft
o
ol:
Don't
r
ep
e
at merge
too
l
candidat
e
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguil
a
r
difftool: put t
h
e cursor on th
e
edi
t
a
b
le fil
e
for Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Ag
u
ilar
di
f
ft
o
o
l: fix d
o
cumentation proble
m
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
David Aguilar
contr
i
b: add 'git
d
ifftool' fo
r
launchi
n
g common merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David A
g
uilar
git-mergetool: pr
o
perly handle "git mergetool
--
f
ilename
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David Aguilar
tests: add a testcase fo
r
"git submodule syn
c
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
D
avid
Aguilar
g
it-
s
ubmodule: add
"
sync
"
command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David
A
guilar
git-su
b
m
o
d
u
le: repl
a
ce du
p
licated code with a mod
u
l
e
_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
D
a
vid Ag
u
il
a
r
[PATCH]
gitk: Don't sh
o
w local cha
n
ges when we
t
h
e
re
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree