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
hideRefs: add support for matching full refs
2015-10-29
Da
v
id Ag
u
ilar
d
i
fftool
:
ignore symbo
l
i
c
links in use_wt_file
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-07-23
Davi
d
Aguilar
con
t
r
ib/subtree: ignore l
o
g
.
date configuratio
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Aguilar
m
erge
t
ools: add w
i
nmerge a
s
a builtin tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Agui
l
ar
mergetool--l
i
b:
s
et
IFS f
o
r
d
i
f
ftool and mergetool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
merge
t
ools
:
sto
p
setting $st
a
tu
s
in merg
e
_cmd
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguil
a
r
mergetool: sim
p
lify c
o
nditio
n
als
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
D
avid Aguilar
difftool--helper: add exp
l
icit exit st
a
t
ement
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Agui
l
ar
mergetool--lib
:
re
m
ove u
s
e of
$statu
s
glo
b
al
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
Dav
i
d Aguilar
difftool
:
honor --trust-exit-code for b
u
i
l
tin tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
D
avid Agui
l
ar
difftool: add support for
--trust-exit-
c
ode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
avid Aguilar
t
7
610-mergetoo
l
: add test cases
f
o
r
mergetool
.
writeToTemp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
a
vid Aguila
r
merg
e
too
l
: add
a
n option for
w
rit
i
ng to a te
m
porary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
mergeto
o
l:
use
more conservative temporary filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David
Agu
i
lar
test-li
b
-functio
n
s: adjust
s
t
yle
t
o match CodingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Da
v
id Aguil
a
r
t7610
-
m
ergetoo
l
: use
t
est_
c
o
nfi
g
to isolate tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
a
vid Ag
u
ilar
mergetools/m
e
ld
:
make usage of `--output` configurable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguila
r
g
i
t-sh-setup: move GIT_DI
R
initializa
t
ion into a functi
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
a
v
i
d Aguilar
mergetool: use mor
e
con
s
e
r
vative tempora
r
y filena
m
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Dav
i
d Aguilar
te
s
t-l
i
b
-functions: adjust st
y
le
to ma
t
ch Cod
i
ngGuidel
i
nes
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7610-mergeto
o
l
:
prefer
t
est_config over git config
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
A
gu
i
lar
t7610
-
mergetool: add missing && and remove commented
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t
7
610-mergetool: use
t
a
b
s instead
o
f
a
mix of tabs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
David Agui
l
a
r
completion: add
-
-s
h
ow-signature for lo
g
and sho
w
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
Da
v
id Aguilar
stash: prefer --quiet
o
ver s
h
ell redirectio
n
of
the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
D
a
vid
Aguilar
refs: make rev-pa
r
s
e --quiet actually quiet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
Da
v
id Aguilar
t1503:
use test
_
must_be_empty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Aguilar
D
o
cumentation: a no
t
e about stdout for
g
i
t rev-parse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
D
avid Aguila
r
cl
e
a
n
ups:
e
nsure that git-compat-util
.
h
is
i
ncluded
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
David Ag
u
ilar
stylefix: asterisks stick to the variable, not the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
Dav
i
d Aguilar
gitk:
C
a
tch mkdtemp errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David
A
g
u
ilar
git
k
: Use
mk
t
emp -d t
o
av
o
id predictab
l
e te
m
po
r
ary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
D
a
vid
A
guilar
gitk
:
Honor TMPDIR when viewin
g
external dif
f
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
David Aguilar
difftool: support
re
p
ositories with
.
git-fi
l
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Aguilar
pull: add --ff-only to the h
e
lp
text
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
D
avi
d
Aguilar
pull: add pu
l
l
.
ff
c
onfi
g
ur
a
tion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
D
a
vid
A
gu
i
lar
imap-send: eliminate HMAC depre
c
ation warnings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
Dav
i
d Aguilar
cache
.
h: eliminate S
H
A-1 deprecat
i
on warnings o
n
Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
Makefile:
a
dd
support for Apple CommonCrypt
o
fac
i
lity
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
David Aguilar
M
a
kefil
e
: fix
d
efault regex
s
ettings on Da
r
win
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
David Aguila
r
m
e
rg
e
too
l
s/kdiff3: do
not use --auto whe
n
diffing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
Dav
i
d Ag
u
ilar
hel
p
.
c
: a
d
d
a
compati
b
ility commen
t
t
o
cmd_ve
r
sion()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
con
t
rib/mw-to-git
/
t/
i
nstall-wiki
.
sh: use a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
contrib/exa
m
ples
/
git-
r
emote
.
perl: use a
lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
id
Aguilar
t
es
t
s: use
a
l
owercase "usage:" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
avid Aguilar
git-svn:
use a lowercase "
u
sage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
Doc
u
mentation/user-
m
a
nu
a
l
.
t
xt: use
a
lowe
r
case "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
t
emplates
/
hoo
k
s--update
.
sample
:
use
a lowercase
"
usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
la
r
contrib/hooks/setgitperms
.
perl: u
s
e a lowerca
s
e
"
usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vi
d
Aguilar
contr
i
b/examples:
us
e
a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguila
r
contrib/fast-imp
o
rt/
i
m
p
ort-
z
i
p
s
.
py: use spaces instead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vi
d
Aguilar
contrib/fas
t
-
i
m
p
ort/import-zips
.
py: fix broken error
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
contr
i
b/fa
s
t-im
p
ort: u
s
e
a lowe
r
c
ase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
contrib/
c
redential:
u
se a lowe
r
c
ase
"usage
:
" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-cvsim
p
ort:
us
e
a lowe
r
case
"
usage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id
A
guilar
g
i
t-cvsimp
o
rt: use a lowercase "
u
sa
g
e:" s
t
r
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
gi
t
-c
v
s
e
xportcommit: use a
l
o
w
ercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-
a
rchimpor
t
: use a
l
owercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
git-merge-one-file: use
a
lowercase "usage:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
git-relink: use a
l
ow
e
rcas
e
"usage:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
git-svn: use a lowercase "us
a
ge
:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
git-sh-setup: use a lowerca
s
e "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t7800: "defaults" is no
l
onge
r
a bui
l
tin tool n
a
m
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
D
av
i
d Aguilar
t
7
800: mode
r
ni
z
e tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
Da
v
id A
g
uilar
t7800: update copyright
notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David Aguil
a
r
difftool: silence uninitialized variable warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
D
avid Aguilar
p
4
merge: fix printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
Da
v
id
Aguila
r
difftool--help
e
r: fix printf
u
sag
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
D
a
v
id A
g
uilar
doc: generat
e
a list of
v
a
l
id merge tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
m
erg
e
tool--lib:
a
dd
f
unct
i
ons f
o
r finding availa
b
le
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David
A
guilar
mergetool-
-
l
ib: i
m
p
r
ove the help
t
ext in
g
u
ess_merge
_
tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Agui
l
ar
mergetool--lib: s
i
mplify comma
n
d express
i
ons
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Ag
u
il
a
r
merget
o
ols: simplify
h
ow
w
e handle "vi
m
" and "defaults"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Aguil
a
r
mergetool-
-
l
i
b: improve show_tool_
h
el
p
(
)
out
p
ut
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David
Aguilar
mergetools/vi
m
: r
e
move
redun
d
a
n
t diff command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
Davi
d
Aguilar
m
e
rgetool
s
/p4
m
erge: Honor $TMP
D
I
R
for the
/dev/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
D
avid
A
guil
a
r
merge
t
ool
s
/p4mer
g
e: Handle "/dev/nul
l
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David A
g
uilar
mergetool--
l
ib: Allow custo
m
commands to
override built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Agu
i
lar
gitk:
R
enam
e
'tagcontents
'
to 'ca
c
hed
_
tag
c
ontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
D
a
v
i
d Aguilar
gitk: Teach "
R
eread referenc
e
s" to
re
l
oad
tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
D
a
vid Aguilar
mer
g
etool,
d
iff
t
oo
l
:
Docu
m
en
t
--tool-h
e
lp
con
s
ist
e
ntly
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Da
v
id Aguilar
difft
o
ol: Disab
l
e
-
-s
y
mlink
s
on
cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Agui
l
ar
difftool
:
H
a
ndle co
m
pare() returning -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool: Wrap long li
n
es fo
r
readability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difftool: Check
a
l
l re
t
urn
codes from compare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David A
g
uilar
diffto
o
l: Handle f
i
nding mergetools/ in
a pa
t
h with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d Aguilar
difftool: Use
symlinks when
d
i
ffing ag
a
in
s
t the wo
r
ktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Aguilar
d
i
fftool: Call the tem
p
direc
t
ory "git-difftoo
l
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
ifftool:
M
o
ve option values into a hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Agu
i
lar
difftool:
Eliminate global variables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
A
guilar
d
i
fftool: Simplify
print_tool_
h
elp()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Aguilar
t7800
:
Test difftool passi
n
g arguments
to d
i
f
f
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David Aguilar
mergetool: Prov
i
de an empty
file when n
e
eded
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David Agui
l
a
r
Makefile: Improve com
p
ile
r
he
a
der
d
e
p
e
nd
e
ncy check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
i
d
Agu
i
lar
mergetools/meld: U
s
e '
-
-output' when available
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetool--lib: Refactor tools in
t
o separate
f
iles
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David A
g
uilar
m
e
rgetool--lib: Make
s
tyle consist
e
n
t
with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
difftool--helper: M
a
ke sty
l
e co
n
si
s
tent
w
ith
g
it
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David Aguil
a
r
t/t75
0
3
-
p
r
e
-
commit-hook
.
sh: Add GIT_PREFIX
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David A
g
uilar
git-mer
g
etool--
l
i
b
: Ma
k
e vim
d
i
f
f
retain the curren
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
a
vid
A
gu
i
lar
git:
Remove handl
i
ng for GIT_PRE
F
IX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next