repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation/git-tools: retire manually-maintained list
2014-11-14
D
a
v
i
d
Agu
i
l
ar
d
i
fftool
:
honor -
-
trus
t
-exit-code
f
or
b
u
i
ltin
t
o
ols
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
Dav
i
d
Ag
u
il
a
r
di
f
ftool: add
s
upport for -
-
trust-exit
-
code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David A
g
uilar
t7610-
m
erg
e
tool: add test cases f
o
r mer
g
etool
.
w
rite
T
oTemp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
mergetool: add an opti
o
n for writ
i
ng to a temp
o
rary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
a
vid
Aguilar
merget
o
o
l
: use more con
s
ervative
t
e
m
porary f
i
l
enames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David
A
guilar
test-lib-functions: adjust style to ma
t
ch CodingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
a
vid Aguilar
t7610-mergetool: use test
_
c
onfig
to isolate tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David A
g
uilar
mer
g
etools/meld
:
mak
e
usage of `--output` co
n
figurabl
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
avid Aguilar
git-
s
h-se
t
up: move G
I
T_DIR initialization into
a
func
t
ion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
a
v
id Aguilar
m
ergetool: use more conservati
v
e temporary
fi
l
enames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
A
guilar
te
s
t-lib
-
fun
c
tions: adjust sty
l
e to match CodingGui
d
eli
n
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Ag
u
ilar
t7610
-
mergetool: prefer
test_conf
i
g over gi
t
config
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7610
-
mergetool:
add missing && and remove comment
e
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
A
guilar
t
7610-merget
o
ol: use
tabs
i
nst
e
ad
of a mix of
tabs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
Dav
i
d Aguila
r
comple
t
ion: add --s
h
ow-signature
f
or log an
d
sh
o
w
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
stash: prefer --quiet
o
ver shell r
e
direction of the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
refs: make rev-pa
r
se --q
u
i
et actually q
u
iet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
David
Agui
l
ar
t1503: u
s
e te
s
t_mu
s
t_be_em
p
t
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
Da
v
id Aguilar
Documentation: a n
o
te a
b
out stdout
f
or gi
t
rev-parse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Aguilar
c
le
a
nups: ensure that git-com
p
at-uti
l
.
h is inclu
d
ed
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
David Aguilar
styl
e
f
ix
:
a
ster
i
sks stic
k
to
t
h
e variable, not the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
David Aguilar
gitk: Cat
c
h mkd
t
e
m
p e
r
rors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David
Aguilar
gitk:
U
se mkte
m
p -d to
avoi
d
pr
e
dict
a
ble
t
emporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Aguilar
git
k
: Honor TM
P
D
IR w
h
en viewing external
d
i
ffs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
Da
v
id Agu
i
lar
difftool: support reposito
r
ies wi
t
h
.
git-
f
iles
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
Dav
i
d Aguilar
p
u
ll: add
-
-ff-only to t
h
e
h
elp text
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
D
a
vid
A
guilar
pull: add pul
l
.
ff configurat
i
on
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
David
A
g
u
ilar
i
m
ap-s
e
nd: eliminat
e
H
M
A
C deprecation war
n
ings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
cache
.
h: eliminate SH
A
-1
deprecation
w
ar
n
ings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
Da
v
id Agui
l
ar
Ma
k
efile: add su
p
port for Apple
CommonCrypto faci
l
ity
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
David Ag
u
i
lar
Makef
i
l
e
: fix d
e
fault r
e
gex se
t
tings on
D
ar
w
in
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
D
avid Ag
u
i
lar
mergetools/kdiff3: do no
t
use --auto when
diffing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David
A
gui
l
ar
help
.
c
:
add a compatibility com
m
ent to cmd_versio
n
()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Agui
l
a
r
con
t
rib/mw-to-g
i
t/t/i
n
st
a
ll-wiki
.
sh: use a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
avid Agu
i
lar
contrib/ex
a
mple
s
/git-remote
.
perl
:
use
a
lowerca
s
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
t
e
s
ts
:
use a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
a
v
id Agu
i
lar
git-svn
:
u
s
e
a lowerca
s
e
"
usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Agu
i
lar
Documentation/user-manual
.
txt: use a lowe
r
cas
e
"usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
i
d Aguil
a
r
templates/hooks--update
.
samp
l
e
: use a lowercas
e
"usag
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
contrib/ho
o
ks/setgitperms
.
perl: use a l
o
wercase "us
a
ge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
contrib/e
x
amples:
u
se
a lowerca
s
e "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid
A
gu
i
lar
cont
r
ib/fast
-
import/
i
mport-zip
s
.
py:
use spaces ins
t
ead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
c
o
ntrib/fast-import/
i
m
port-zips
.
py: fix
b
roken error
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
id Ag
u
ila
r
c
o
n
trib/fast-import
:
use a l
o
wer
c
ase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
contr
i
b/credential:
u
se a
l
owerca
s
e "us
a
ge:"
st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
gi
t
-cvsimport: us
e
a
lo
w
ercase "
u
s
age
:
" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vi
d
Ag
u
ilar
g
it-cvsimport
:
use a l
o
w
er
c
ase "
u
sage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
it-
c
vs
e
xpo
r
t
c
ommit: use
a
l
o
wercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
gi
t
-
a
rchimport: use a lo
w
ercase "
u
s
age:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
git-merge-
o
n
e-f
i
le: use a
l
owercase "usage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
it-relink: u
s
e a low
e
r
case
"
u
sage:"
s
trin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-svn
:
use a lowercase "
u
sage:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
git-sh
-
setup: us
e
a lowe
r
case "usag
e
:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
Da
v
id
A
g
uilar
t
7800: "defaults" is no longer a b
u
ilt
i
n too
l
nam
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t7800: modernize t
e
st
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David Agu
i
lar
t7800: upda
t
e copyright notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David A
g
u
i
lar
di
f
fto
o
l
:
sil
e
n
c
e
uninitialized variable
warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
Davi
d
A
guilar
p4me
r
ge: fix
printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
D
a
v
id Ag
u
ilar
difftool--help
e
r: fix print
f
usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguila
r
doc: g
e
nerate a
l
ist of
valid me
r
g
e t
o
ols
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David
A
gui
l
a
r
mergeto
o
l
-
-
li
b
: add functio
n
s for
finding available
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David
Agu
i
lar
merge
t
ool--li
b
: imp
r
ove the help
tex
t
in
g
uess_merge_
t
ool
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
D
avid Agui
l
a
r
me
r
ge
t
ool--lib: si
m
p
li
f
y co
m
mand expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Dav
i
d Aguila
r
me
r
getools: simplify how we handle
"vim
"
and "defaults
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
D
avid Aguilar
m
e
rgetool--lib: improve
show_tool_h
e
lp() output
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David A
g
uilar
mer
g
etools/vim:
remove
r
edundant
diff command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
David Aguila
r
merg
e
to
o
ls/p4m
e
rge
:
H
o
nor $TM
P
DIR for the /dev/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
David Aguilar
mergetools/p4
m
erge: Handle
"
/dev
/
null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David A
g
u
ilar
m
e
rg
e
t
o
o
l--lib: Allow
c
u
st
o
m comm
a
nds to override b
u
ilt-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Davi
d
A
g
u
i
lar
gitk: Rename 'tagcontents' to 'cach
e
d_tagcontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David
A
gu
i
lar
g
itk
:
T
e
ach "R
e
read refere
n
ces" to
reload tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
Da
v
id Ag
u
ilar
mergetool,difftool: Document --tool-help consistently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David A
g
ui
l
ar
difftool: Disable --symlinks
o
n cyg
w
in
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David
A
guilar
diff
t
o
ol:
Handle compare() r
e
turnin
g
-1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David
A
guilar
dif
f
tool: Wrap long line
s
for read
a
bili
t
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
Davi
d
A
g
uilar
difftool: Check all return c
o
des from
compa
r
e(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Agui
l
ar
d
ifftool: Handle finding mer
g
etools/ in a
p
a
th with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id Aguilar
d
ifftool:
Use
symlinks when d
i
ff
i
ng against the wo
r
ktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
A
guila
r
difftool:
C
all the temp directory "git-diff
t
ool
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
Aguilar
difftool: Move opt
i
on v
a
l
ues
in
t
o a h
a
sh
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
A
guilar
difftool: Eli
m
ina
t
e
global var
i
ables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difft
o
ol: Simplify pri
n
t_tool
_
help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Aguilar
t
7
8
00: Test
d
iffto
o
l
passing arguments to diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
D
a
vid Aguilar
mergetool: Provide an e
m
p
t
y file when needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
Dav
i
d Aguilar
Ma
k
efile: Improve compiler
header depen
d
ency ch
e
ck
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
avid Aguilar
merget
o
o
ls
/
meld
:
Use '--outpu
t
' when avail
a
ble
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Davi
d
A
g
uilar
mer
g
etool--lib: Refact
o
r tools into separate files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
a
v
i
d Aguilar
merget
o
ol--
l
ib: Make
s
t
yle consistent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David
A
g
uilar
difftool--help
e
r:
M
ake style consi
s
t
e
nt with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
Da
v
i
d
Agui
l
a
r
t/t7503-pre-commit-hook
.
s
h
:
Ad
d
GIT_PREF
I
X tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
g
it-merg
e
tool--lib: Make vimdiff retain the curr
e
n
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Agu
i
lar
git: Remove ha
n
dling for GIT
_
P
R
EFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
setup: Provide G
I
T
_PREFIX to built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Ag
u
ilar
s
u
b
module sync
:
Update "submodule
.
<name>
.
u
rl"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David Aguilar
mergetool: Skip au
t
oresolved pat
h
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David
A
guila
r
Docume
n
tatio
n
: Explain g
i
t-merget
o
ol's
u
se of
temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
D
a
v
i
d
A
g
u
ilar
Makefile: Remove u
s
age of depr
e
cat
e
d
Pyth
o
n
"has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David
A
g
uilar
difftool: Fix '--gui' when diff
.
guit
o
ol
i
s u
n
configured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t
7800-difftool
.
s
h: Test mergetool
.
p
rompt fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Aguila
r
difftool: Update copyright not
i
c
e
s to list
each
year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next