repo.or.cz
/
git
/
raj.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-relink: use a lowercase "usage:" string
2013-02-24
David A
g
uilar
git-
r
elin
k
: use a lowercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-svn: use a
lower
c
ase "
u
sag
e
:
"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
Ag
u
ilar
g
i
t
-
sh-setu
p
: use a lowercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
Dav
i
d Aguilar
p4merge:
f
ix printf usag
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David A
g
uilar
difftool--he
l
per: fix printf us
a
ge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David A
g
uil
a
r
doc: generate a list of valid m
e
rge
t
o
ols
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
merge
t
ool
-
-
l
ib: ad
d
functions for fin
d
in
g
a
v
ailable
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David A
g
uila
r
merge
t
ool--lib
:
improve the help text in guess
_
merge_
t
ool()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetool
-
-lib: simplify c
o
mmand expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
D
a
vid Aguila
r
mergetools: s
i
mplify ho
w
we
h
a
ndle "vim" and "de
f
au
l
ts"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
mer
g
e
tool--lib: improve
show_tool_help() output
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
Da
v
id Aguilar
merg
e
t
o
ols/vim: remove
r
edundant dif
f
command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
David Agu
i
lar
mer
g
etools/p4merge: H
o
nor $T
M
P
D
IR for the /dev/n
u
ll
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
David Aguilar
me
r
get
o
ols/p4merge: Handle "/de
v
/null"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
Da
v
id Aguilar
mergetool--lib: Allow cus
t
om c
o
mmands to override built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: Rename 'tagcontents' to 'cached_tagcontent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David A
g
uilar
gitk
:
T
e
a
c
h
"Re
r
ead references"
to re
l
oad
t
ags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
David Aguilar
mergetool,difftool:
D
ocume
n
t --tool-
h
elp consistent
l
y
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool: Disable
-
-symlinks o
n
cygwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguila
r
difftoo
l
: Ha
n
dle com
p
are() returning -1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguil
a
r
diffto
o
l: Wrap lo
n
g
lines for readability
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
D
avid Ag
u
il
a
r
diff
t
ool: Check all
r
et
u
r
n
cod
e
s from
compar
e
()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Agu
i
l
a
r
difftool: Handle fi
n
ding mergetool
s
/ in a
path with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id Aguilar
diff
t
o
o
l
: Use sym
l
ink
s
when diffi
n
g agains
t
the worktree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
diff
t
o
o
l
:
Call
t
h
e temp directory "gi
t
-
difftool"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d Agui
l
ar
diff
t
ool: Mov
e
option values
i
nto a
h
a
sh
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Agu
i
l
ar
difftool: Eliminate global variables
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
di
f
f
tool: Simplify
prin
t
_tool_hel
p
()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
David Aguilar
t7800: Test
difft
o
ol passing a
r
guments to diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David Aguilar
merget
o
ol
:
Provide an empty file when needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
Da
v
id Aguilar
Makefile: Im
p
rove co
m
pil
e
r header dependency ch
e
ck
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d Agui
l
ar
m
e
r
getools/
m
eld: Use '--output' w
h
en available
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David
Agu
i
lar
mergetool--lib:
Refactor tools into se
p
arate files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetool--lib: M
a
ke style con
s
i
s
t
en
t
with
git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
difftool--he
l
p
er
:
M
a
ke style
consistent wi
t
h
git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
D
avid Agu
i
la
r
t/t7503-pre-com
m
i
t-
h
o
o
k
.
sh: Add GIT_PREFIX test
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
avid
A
g
u
ilar
git-m
e
rgeto
o
l--lib: Make
v
i
m
d
iff retai
n
the current
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
a
v
i
d Aguilar
git: Remove handling fo
r
GI
T
_PRE
F
IX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Dav
i
d Aguilar
setup: Provide GIT_PRE
F
IX to built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
D
avi
d
A
guilar
s
u
bmodule
sy
n
c: Update
"submodule
.
<name>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
David Agu
i
la
r
m
e
rgetool:
S
kip autor
e
s
olv
e
d paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
Documentation
:
E
x
p
lain git
-
me
r
g
etool's use of temporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David Aguilar
Ma
k
efile: Remove usage of deprecat
e
d Python "has
_
key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
Dav
i
d Aguilar
difftool: Fix
'
--gui' when dif
f
.
gui
t
ool is u
n
configured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t7800-difftoo
l
.
sh: Test mergetoo
l
.
prompt fa
l
lba
c
k
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
D
a
vid Agui
l
ar
difftool:
U
pdate cop
y
right
notices
t
o lis
t
eac
h
yea
r
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Dav
i
d Agu
i
l
ar
difftool: U
s
e eval to expand '-
-
e
x
tcmd' expression
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
id A
g
u
ilar
difftool: Add '
-
x' and as a
n
a
l
ia
s
for '-
-
extcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Agui
l
ar
t7800-difftool
.
sh: S
i
mplify the --extcmd
t
est
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
git-dif
f
.
t
xt: Lin
k
t
o git
-
difft
o
ol
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d
A
guilar
d
ifftoo
l
: Allow specifying unconf
i
gured co
m
ma
n
d
s
w
i
th
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
d
ifftool--h
e
lper:
R
e
mo
v
e use of the GIT_MERGE_
T
OOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
d
i
f
f
tool--helpe
r
: Upd
a
te copy
r
ight and remove distracting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David
Aguilar
git-difftoo
l
: Add '--gui' for selectin
g
a GUI too
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
D
avid Aguilar
t
7800-difftool: Set a
b
ogus tool for use by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
Davi
d
A
guilar
help: Do not
u
nne
c
e
s
saril
y
look for
a repository
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
D
avid
A
guilar
submodule
.
c
:
Squelch a "us
e
before as
s
ignment"
w
arning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguila
r
diff: genera
t
e pretty fi
l
enames in prep
_
tem
p
_blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Ag
u
i
lar
c
ompat:
a
dd
a
b
asename()
co
m
pa
t
i
b
ility function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
avi
d
Agui
l
ar
compat: add a
m
kstemps(
)
compat
i
bi
l
ity
f
unction
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
id Agu
i
lar
Add git-r
e
place to
.
giti
g
nore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
Da
v
id Aguilar
mergeto
o
l--lib: add support for a
r
axis me
r
ge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
Da
v
id Aguilar
me
r
geto
o
l--l
i
b: s
p
ec
i
alize diff
o
p
t
i
ons fo
r
em
e
rge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
mer
g
etool--lib: si
m
p
l
ify API usage by r
e
m
o
vi
n
g more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
difftool/m
e
rgetool: refactor commands to u
s
e git-mergetool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
id Aguilar
mergetool: u
s
e $(
.
.
.
) instea
d
of
`
backt
i
cks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid A
g
uilar
bash completion: add git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Agu
i
lar
difftoo
l
: ad
d
support
f
or a difft
o
ol
.
prompt c
o
nfig
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
di
f
ftoo
l
:
ad
d
various
git-difftool
tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Ag
u
i
l
ar
d
ifft
o
ol:
move 'git-diff
t
ool' out of contrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
id Agui
l
ar
diffto
o
l: add
a -y shortcut for --
n
o-
p
r
o
mpt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool:
use perl buil
t
-ins when testing
f
or msys
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
David Aguilar
di
f
ftool:
re
m
ove merge options
f
o
r
opendiff, tk
d
iff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Agui
l
a
r
everyday: u
s
e the dashless form of git
-
init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
David Aguilar
contrib/difftool: use a separate confi
g
namespace for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
Davi
d
Aguilar
c
ontrib/difftool:
D
on't repea
t
merge tool cand
i
dates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
Da
v
id
A
gui
l
ar
difftool: put the cursor on the edita
b
le f
i
le for Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
D
a
v
i
d Agu
i
lar
diffto
o
l: fi
x
documen
t
ati
o
n pr
o
blem
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
D
a
vid Aguilar
c
o
n
t
rib: add
'
git difftool' for l
a
unchin
g
common m
e
rge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
D
a
vid A
g
uilar
g
i
t-
m
ergetool: pro
p
erly handle "git mergetool -
-
file
n
am
e
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David Aguilar
tests: a
d
d a testcase for "git s
u
bmodule sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
David Ag
u
ilar
git-submodule: add "syn
c
" command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David Agu
i
lar
gi
t
-
s
ubmodu
l
e:
r
eplace
d
u
p
li
c
ated
c
ode
w
ith a module_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
David
Ag
u
ilar
[PATCH]
gitk: Don'
t
s
h
ow local ch
a
nges when
w
e t
h
ere
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree