repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
push.c: add an --atomic argument
2014-11-14
David Aguilar
difftool: honor --trust-exit
-
co
d
e f
o
r builtin tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
David Aguilar
difft
o
ol
:
a
d
d support for
-
-trust
-
ex
i
t-co
d
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t
7610-me
r
g
e
tool:
a
dd
t
est cases for mergetool
.
writeToTemp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David A
g
uilar
mergetool:
a
d
d an option for writin
g
to a
t
e
mporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David
A
gui
l
ar
mergetool: use
m
ore
c
onser
v
ative tem
p
orary
f
ilenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
test-l
i
b-f
u
n
c
ti
o
ns:
adjus
t
style to match
C
o
dingGuide
l
ines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t
7
610-mergetool
:
use tes
t
_con
f
ig to isol
a
te
tes
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David
A
guilar
mer
g
e
tools/
m
eld
:
make usage of `-
-
output` c
o
nfigur
a
ble
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
A
g
u
i
lar
g
it-
s
h
-setup:
move
GIT_DIR initialization i
n
to a functi
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
me
r
getool: use more conservati
v
e temporary filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David A
g
uilar
t
e
st-
l
ib-f
u
nctions: adjust style to match CodingG
u
idelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Davi
d
Aguilar
t76
1
0-mergetool: pref
e
r t
e
s
t
_config over git config
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Dav
i
d Aguilar
t7610-mergetool: add missing && and
r
e
m
ove commented
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7610-merget
o
ol:
u
se tabs instead of a
m
ix o
f
tabs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
David Aguilar
completion: add --show-signature fo
r
log
and show
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
Dav
i
d
Ag
u
il
a
r
stash: prefer
-
-
q
u
i
et over shell
r
edirecti
o
n
of the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David A
g
uilar
refs: make rev-parse -
-
quiet actually quiet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
David Aguilar
t1503: u
s
e
test_must_be_empty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Aguilar
Documentati
o
n:
a note
a
bout stdou
t
f
o
r git
rev
-
p
a
rse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
Davi
d
A
gu
i
lar
cleanups: ens
u
r
e
that git-compa
t
-
util
.
h is
in
c
lu
d
ed
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
Davi
d
Aguilar
sty
l
efix: as
t
erisks
stick to the variable, not the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
David Agu
i
lar
gitk: Catch mkdte
m
p errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
D
avid Aguilar
gitk: Use
mktem
p
-d to
a
void p
r
edictable tempora
r
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Agui
l
ar
gitk: Honor TMPDIR when vie
w
ing external diffs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
David Aguilar
di
f
ftool: support repositories wit
h
.
git
-
files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Agu
i
lar
p
ull
:
add --
f
f
-only t
o
t
he help
t
ext
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
Davi
d
Aguila
r
pull: add pull
.
ff configuration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
Dav
i
d
Aguil
a
r
i
m
ap-send: eliminate HM
A
C deprec
a
ti
o
n warn
i
n
gs on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
D
a
vid Aguilar
cac
h
e
.
h: elimin
a
t
e SHA-1 deprecati
o
n warnings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
M
akefile: ad
d
support f
o
r Ap
p
le CommonCrypto
facilit
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
Da
v
i
d
Ag
u
ilar
Makefil
e
: fix default reg
e
x se
t
tings on D
a
rw
i
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
Davi
d
Aguilar
mergetoo
l
s/kdiff3:
d
o n
o
t use --auto when dif
f
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David
Ag
u
ila
r
help
.
c: add a
compatib
i
lity comm
e
n
t
t
o
cmd_version()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
contr
i
b
/
m
w-to-git
/
t/install-wiki
.
sh: use a lowe
r
cas
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Ag
u
ila
r
contrib/examples/
g
i
t
-remot
e
.
p
e
r
l
: us
e
a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
tests:
u
s
e
a lowercase
"
usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
id Aguil
a
r
git-
s
vn:
use a lowercase "usage
:
" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
Doc
u
mentatio
n
/user-ma
n
ual
.
txt: use a lowercase "usa
g
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
t
emp
l
ates/
h
ooks--update
.
samp
l
e: use a lowerc
a
se "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
contrib/hooks/setg
i
tperms
.
perl
:
u
se a lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d
Aguil
a
r
contrib/e
x
amples: use a lowercase "usage:
"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
cont
r
ib/fast-import/import-zips
.
p
y:
use spaces instead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
cont
r
i
b/f
a
s
t
-import/import-
z
ips
.
py: fix broken error
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
contr
i
b/fast-import:
u
s
e a lowercase
"
usage:
"
strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
id
A
guilar
contrib/credential: use a lo
w
ercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
id A
g
u
ilar
git-cvsimp
o
rt: use a lowercas
e
"usage:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid
Agu
i
lar
git-cvsi
m
p
o
rt: use a lowercase "usage:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uila
r
git-cvsexportcommit: use a lowerc
a
se "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-a
r
c
himport: use a lowercase "u
s
age:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
a
r
git-m
e
rge-one-file: use
a lowercase "usage:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-relink: u
s
e a
l
o
wercase "us
a
ge:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-svn: use a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git
-
sh
-
setup: use a low
e
rc
a
se "usage:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
D
avid Aguilar
t7800: "
d
e
f
aults" is no lo
n
ger a builtin tool na
m
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t78
0
0:
mod
e
rnize tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
Davi
d
Aguilar
t7800: update copyright notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
Da
v
i
d
Aguilar
diff
t
ool: s
i
lence un
i
niti
a
lized variable
w
arning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
Dav
i
d Aguilar
p
4merge: fix printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
Davi
d
Ag
u
ilar
diff
t
o
ol--helper: fix printf u
s
age
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
D
avid
A
guilar
doc: generate a list of valid merge too
l
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
D
a
vid
Aguilar
mergetool-
-
lib: add functions for finding av
a
ilable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
D
avid
Agu
i
lar
mergetool--lib: improve the help tex
t
in guess_merge_
t
ool
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
me
r
getool--lib: simplify comman
d
expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Agui
l
ar
mergetools: simplify how we
h
andl
e
"
v
i
m" and "defa
u
l
ts"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Agui
l
a
r
mergetoo
l
--li
b
: imp
r
ove sho
w
_tool_h
e
lp
(
) o
u
t
put
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David
Aguilar
m
er
g
etools
/
v
i
m: remove
redundant diff
c
ommand
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
D
av
i
d Agu
i
lar
merget
o
ol
s
/p
4
merge: Honor $TMPDIR for the /dev/nul
l
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
Davi
d
Aguilar
m
e
r
g
etools/p
4
m
e
r
ge: Handle "/de
v
/null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
Dav
i
d Agu
i
lar
m
e
r
ge
t
o
o
l--lib: Allow cus
t
om
c
om
m
ands to
o
verride buil
t
-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David
Aguilar
gitk: R
e
name 'tagcontent
s
'
t
o
'cached_tagcon
t
ent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
D
avid Agui
l
ar
gitk: Tea
c
h "Re
r
ea
d
r
e
fe
r
ences" t
o
reload tag
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David Aguilar
mergeto
o
l,diff
t
ool:
Document --tool-h
e
lp consist
e
ntly
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Davi
d
Aguil
a
r
difftool: D
i
s
able
--s
y
mlink
s
o
n cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
a
vid Aguila
r
di
f
ftool:
Handle
c
ompar
e
() returning -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
a
v
i
d Agu
i
lar
dif
f
tool: W
r
a
p
lo
n
g lines for readability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difftool:
Check all
r
etu
r
n codes fr
o
m
c
omp
a
re()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
D
avid
A
guilar
difft
o
ol: Handle finding mergetoo
l
s/ i
n
a path with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
iffto
o
l:
U
se
s
ymlinks when diffin
g
again
s
t the
w
o
r
k
tree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Agui
l
ar
difftool: Call the temp d
i
re
c
tory "gi
t
-
d
iff
t
o
ol"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d Aguila
r
d
ifftool: Move
o
ption valu
e
s into a hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Eli
m
inate global vari
a
bles
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguila
r
d
i
ffto
o
l: Simplify print_
t
ool_help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Aguilar
t78
0
0: Tes
t
difftool
p
assing arguments to diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
D
a
vid Aguilar
mergetool:
P
r
o
vide an empt
y
f
i
le whe
n
needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
Dav
i
d Aguilar
Makefi
l
e: Im
p
r
ove compiler
h
eader depe
n
d
e
n
cy check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David
Agu
i
lar
mergetools/me
l
d: Use '--output' when
available
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
m
e
rgeto
o
l--lib
:
Refactor tools into separate fi
l
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
merge
t
ool--
l
ib: Make s
t
y
l
e co
n
sistent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vid
A
guilar
d
ifftool--
h
elper
:
Ma
k
e
style consistent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David Ag
u
ilar
t
/
t7503-pre
-
commit-hook
.
s
h
: Add GI
T
_PREFIX
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Da
v
id A
g
u
i
la
r
git
-
mergetool--lib
:
Make v
i
mdiff
retain the
current
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David A
g
ui
l
ar
git: Re
m
ove
h
andli
n
g
for GIT_
P
REFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Dav
i
d
A
g
u
i
lar
setup:
P
r
o
v
i
de GIT_PREFIX to
b
uilt-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Aguil
a
r
sub
m
odul
e
sync: Update
"
subm
o
dule
.
<name>
.
u
r
l"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David Agui
l
ar
mergetoo
l
: Sk
i
p
a
utoresolv
e
d paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David Agu
i
lar
Doc
u
mentation: Explain
g
it-
m
ergetool's use of temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
Davi
d
Aguil
a
r
M
a
kefile: Remove usage
o
f
deprecated Pyt
h
o
n "has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
Da
v
id Aguilar
difftool:
F
ix '--gui'
w
he
n
d
if
f
.
guitool is unconfigure
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
Davi
d
Aguilar
t7800-
d
i
f
ft
o
ol
.
sh: Test
mergetool
.
prompt fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
difft
o
ol: Update copy
r
igh
t
n
otices to list ea
c
h
year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next