repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
worktree: simplify new branch (-b/-B) option checking
2014-11-14
D
a
v
id A
g
uilar
difft
o
ol: hono
r
--trus
t
-exit-cod
e
for builtin tool
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
Dav
i
d Ag
u
ilar
difftool: add support for
-
-trust-exit-code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Da
v
id
A
g
u
i
l
ar
t7610-mer
g
etoo
l
:
a
d
d
te
s
t cases for mergetool
.
writeToTemp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David A
g
uil
a
r
merget
o
ol
:
add a
n
option for
wr
i
ting to a
t
emporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Dav
i
d
Aguilar
merg
e
tool
:
use more conservati
v
e
temp
o
r
a
ry filen
a
mes
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Dav
i
d Aguila
r
test-
l
ib
-
f
u
n
c
t
ions:
adjust style to m
a
tc
h
CodingGuid
e
l
i
n
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Da
v
id Aguilar
t7610-me
r
getool: use test_config to isolate t
e
sts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Agui
l
a
r
mergetools/m
e
ld: make usage of `--out
p
ut`
c
onfi
g
u
rable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
git-
s
h-setup: mov
e
GIT_DIR ini
t
ializ
a
tion into a
f
unction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Davi
d
Aguila
r
mergetool: use more co
n
s
e
rva
t
ive tempor
a
ry filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguila
r
test
-
lib-functions
:
ad
j
u
s
t
style to match CodingGuide
l
i
nes
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David A
g
uilar
t761
0
-
m
ergetool: prefe
r
t
est
_
config over git config
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t
7610-me
r
getool: add m
i
ssing && and remo
v
e co
m
me
n
ted
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7610
-
mergetoo
l
: use tabs i
n
stead o
f
a mix of tabs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
David Agui
l
ar
c
ompleti
o
n: add --show-signature for l
o
g and show
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
D
avi
d
Aguilar
stash: pref
e
r -
-
quiet over
s
hell redi
r
ection of t
h
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
Da
v
id Ag
u
il
a
r
r
e
fs:
m
ake rev-parse --q
u
iet ac
t
u
a
lly
q
u
iet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
David Aguilar
t1503: use test_must_be_empty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
Da
v
id Aguilar
Docum
e
nt
a
tion: a note about stdou
t
f
or
git rev-parse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
Da
v
id Agui
l
a
r
cleanups:
ensu
r
e
that
g
it
-
compat-util
.
h is included
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
David Agu
i
lar
stylefix: asterisks stic
k
to the vari
a
ble, not the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
D
avid Aguilar
gitk: Cat
c
h mkd
t
emp errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
D
av
i
d Ag
u
ilar
gitk: Use mktemp -d
t
o avoid predi
c
ta
b
le te
m
porar
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
Da
v
id Agui
l
ar
gitk:
Honor T
M
PD
I
R when viewing e
x
tern
a
l diffs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
David
Aguila
r
difftool: sup
p
ort repo
s
itories with
.
git-files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
D
a
vid Aguilar
pull: a
d
d --ff-only to the help text
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Ag
u
ila
r
pu
l
l: add pull
.
ff
c
o
n
figuration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
David Aguilar
imap
-
s
e
nd: el
i
minate
HMAC de
p
r
ecation war
n
i
ngs on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
cache
.
h
:
e
l
iminate SHA-1 deprecation warnings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
Makefile: add suppo
r
t
for Apple
CommonCry
p
t
o f
a
cili
t
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
David Agu
i
lar
M
a
kefi
l
e: fix default regex se
t
tings
o
n
D
arwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
David Aguilar
mergetools/kdiff3: do not u
s
e --auto when diffing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David
A
gu
i
lar
hel
p
.
c
:
add a comp
a
tib
i
lity comment to cmd_versio
n
()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
contrib/m
w
-
t
o-git
/
t/install-
w
i
k
i
.
sh:
u
se a low
e
rcase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Dav
i
d Aguilar
contrib/ex
a
mples/git-remote
.
perl: use a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Ag
u
i
lar
t
ests
:
use a lowercase "usage:" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Agu
i
lar
git
-
svn: use a low
e
r
c
ase
"
usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
Documentat
i
on/us
e
r-manual
.
t
xt: use a lowercase "u
s
age
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
templat
e
s/hooks-
-
update
.
sam
p
le: use a lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
av
i
d
Agu
i
la
r
c
o
n
trib/hooks/setgitper
m
s
.
perl:
use a
lowerca
s
e "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
contrib/ex
a
mples: use a l
o
wercase "
u
s
age:" st
r
in
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guil
a
r
c
ontrib/fast
-
import/impo
r
t-zips
.
py: use spaces i
n
s
tea
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
c
ontrib/fast-
i
mport/import-zips
.
py
:
fi
x
broken error
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d
Aguilar
contrib/fast-import: use a lowercas
e
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
con
t
ri
b
/credential: u
s
e a
l
owercase "usag
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
it-cvsimport:
use a l
o
wercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-c
v
simport:
use a low
e
rcase
"u
s
a
g
e:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguil
a
r
git-
c
vsexportcommit:
u
se a lowerc
a
se
"
usage:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
gui
l
a
r
git
-
arc
h
import: use a lowercase "us
a
ge:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
git-merge-one-
f
ile:
use
a
l
o
werca
s
e "us
a
ge:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vi
d
A
g
u
i
l
a
r
g
i
t
-relink: us
e
a lower
c
ase "usage
:
" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
git-svn: u
s
e a lowercase "
u
sage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
git-sh-setup:
use a lowercase "usage
:
" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t780
0
: "defau
l
ts
"
i
s
n
o
longer a built
i
n
tool name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t
7800: mod
e
rnize
t
e
s
ts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David Aguilar
t7800
:
update copyright
n
otice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
Da
v
i
d Aguilar
difftool
:
silence uninitia
l
i
z
e
d var
i
able warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
Dav
i
d
A
gui
l
ar
p4m
e
rge
:
fix
printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Ag
u
ilar
dif
f
t
o
ol--helper: fix
p
r
i
ntf u
s
age
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David A
g
ui
l
ar
doc: g
e
ner
a
te
a
list of
v
a
li
d
merge to
o
ls
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguil
a
r
mergetool--lib: add functions
for fi
n
di
n
g available
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
m
ergetool-
-
lib: improve the help text in gue
s
s_mer
g
e
_
tool(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Da
v
id Aguilar
me
r
getool--lib: simplify c
o
mmand
e
xpressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Ag
u
ilar
m
e
rgetools: simplify how
we handle "vim"
a
nd "defaults
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Aguila
r
mergetool--lib: impr
o
v
e show_
t
o
o
l_help() output
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David
A
gu
i
l
a
r
mergetoo
l
s/vim:
r
emove
r
e
dunda
n
t
d
iff comma
n
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
David Aguilar
mer
g
etool
s
/p4
m
erge: Honor
$
T
MPDIR for the /dev/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
D
a
vid Aguilar
mergetools/p4me
r
ge
:
Ha
n
dl
e
"
/
dev/n
u
ll"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David
Ag
u
ilar
mergetool--lib: Allow cu
s
tom c
o
mmands to over
r
ide built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Davi
d
Aguilar
gitk: Rena
m
e 't
a
gcontents' to 'cached_tagcontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
g
it
k
: T
e
ach "Reread reference
s
" to
rel
o
ad ta
g
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David Agu
i
la
r
mer
g
etool,
d
i
ff
t
ool: Document -
-
tool-he
l
p consisten
t
ly
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool: D
i
s
able --symlinks on
cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Agui
l
a
r
difftool: Handle comp
a
re() returning -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
a
vid Aguilar
d
i
fftool: Wrap long li
n
e
s f
o
r readab
i
l
i
ty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
D
a
vid Aguil
a
r
di
f
ftool: Check all return co
d
e
s f
r
om
c
ompare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Agu
i
lar
di
f
ftool: Handl
e
finding mergetools/ in
a
path with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
i
d Aguilar
difftool: Use syml
i
nks when diffin
g
against
t
h
e
work
t
ree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d Ag
u
ilar
difftool
:
C
all
t
he tem
p
directory "g
i
t-d
i
fftool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
di
f
ftoo
l
: Move option values into a has
h
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Agu
i
lar
difft
o
ol: Eliminate global variabl
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguil
a
r
difftoo
l
:
S
implify print_tool_h
e
lp()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
D
avid Aguilar
t
7800: Test difft
o
ol passing arguments to diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David Aguilar
m
er
g
e
t
ool:
Provide an empty file when needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David Aguilar
Mak
e
file: Impr
o
v
e comp
i
ler
header
dependency c
h
eck
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David
Aguilar
m
ergetools
/
m
e
ld: Use '--output'
w
hen av
a
ilable
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
i
d
Aguilar
mergetool--lib: R
e
factor too
l
s
i
nt
o
separate file
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d A
g
uilar
merget
o
ol
-
-
li
b
: Make style consistent wit
h
gi
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vid Aguila
r
difft
o
ol--hel
p
er: Mak
e
style consi
s
tent
w
ith gi
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
D
avid Aguilar
t/t7503-
p
re-commit-hook
.
sh: Add GIT_PREFIX test
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguil
a
r
git
-
mergetool--
l
ib: M
a
ke vim
d
iff r
e
tain the c
u
rrent
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
avid A
g
uil
a
r
git: Remove ha
n
dling for
G
IT_PRE
F
IX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
a
vid
A
g
uilar
se
t
up
:
Provi
d
e GIT_PREFIX to built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
D
avi
d
Agui
l
ar
su
b
m
o
dule
s
ync: Updat
e
"s
u
bmodule
.
<na
m
e>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
Da
v
id Aguilar
merge
t
o
ol: Skip
a
utores
o
lved paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
Documenta
t
ion
:
E
x
plain git-mer
g
etool's u
s
e of te
m
porary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David Aguilar
Makefile: Remo
v
e usage of
deprecated
Py
t
h
o
n "has_
k
ey
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
Da
v
i
d Aguilar
dif
f
t
o
ol: Fix '--gui' whe
n
diff
.
g
uitool is unconf
i
g
u
red
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
Da
v
i
d Aguilar
t7800-difftool
.
sh: Test
m
ergetool
.
pro
m
pt fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David A
g
uilar
d
i
fftool: Update copyright noti
c
es to lis
t
e
a
ch y
e
a
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next