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
test-parse-options: update to handle negative ints
2015-06-22
Charles
B
ailey
test-parse-op
t
ion
s
:
u
pdate t
o
handle
n
egative i
n
ts
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Charles Bailey
d
i
f
f
t
ool
:
don
'
t assume that def
a
ult s
h
is
sane
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
C
ha
r
les B
a
iley
mergetool: don't require
a wor
k
tre
e
for --tool-help
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-21
Charles Bail
e
y
Fix
contrib/subtree Make
f
ile to patch #! line
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
Charles Bailey
fil
t
e
r
-branch: eliminate duplicate mapped paren
t
s
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Charles Ba
i
ley
compat/
b
swap
.
h: detect endi
a
nness on m
o
re platforms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
C
h
arles Ba
i
ley
tests: don't
rel
y
on str
e
rror tex
t
w
h
en
t
esting rmdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charle
s
Ba
i
l
e
y
dir
.
c:
mak
e
git_fnmatch
(
) no
t
inlin
e
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Charles Bailey
merget
o
ol: Remov
e
ex
p
l
icit r
e
ferences to /de
v
/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charles Baile
y
s
tash tes
t
s
: stash can lose
d
ata in a file remov
e
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bailey
stash: D
o
n't over
w
rit
e
files
that h
a
v
e go
n
e fr
o
m the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Ch
a
rles
Bailey
Documentation: Desc
r
ibe other situations where -z a
f
fects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles
B
ailey
C
hange xd
l
_merge to gener
a
te o
u
tput even for
null merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles
B
ailey
t6023:
m
e
rge
-
file fail
s
t
o
output anything for a degenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Char
l
es Bailey
mergetool: fix
r
unning mergetool in s
u
b-direct
o
ries
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
C
ha
r
les Bailey
mer
g
e
t
ool: Add
a test for
running
m
erg
e
t
o
ol in
a
sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Ch
a
r
l
es Ba
i
le
y
mergetool:
respect
a
utocrlf by using checkout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles
B
ailey
mergetool
:
Don't keep te
m
porary m
e
rge files
unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Cha
r
l
e
s
Bailey
mergetoo
l
: Add p
r
o
mpt to c
o
ntinue after fail
i
n
g to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Add -y/
-
-no-prompt op
t
ion to mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
F
i
x so
m
e
tab/space
inco
n
s
i
stenci
e
s in g
i
t
-mer
g
etoo
l
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
C
h
arles Baile
y
git-archive:
w
ork in bare r
e
pos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charl
e
s Bailey
Ma
k
e git archive
r
espect core
.
autocrlf when cre
a
ting
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charle
s
Bailey
A
d
d new tes
t
to demonstrate git archive core
.
a
utocr
l
f
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Cha
r
les Bailey
merge-tool doc
u
ment
a
ti
o
n: describe custom command usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Ba
i
ley
git-mergetool doc
u
mentaiton: sh
o
w toolnames in typewri
t
er
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
harl
e
s
Bail
e
y
Add a very ba
s
i
c test sc
r
ipt for git
m
e
r
ge
t
ool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
Bailey
Teac
h
git mergetool to
use c
u
stom
c
ommands defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
B
a
i
ley
Changed an i
n
ternal vari
a
ble
o
f mergetool
t
o support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bai
l
ey
Tidy up git merg
e
to
o
l's bac
k
u
p file
behavi
o
ur
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Bailey
gitk
:
Fix the Makefile to cope with sys
t
ems lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles B
a
iley
Remove ol
d
gener
a
ted file
s
from
.
gitigno
r
e
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
C
har
l
e
s
B
aile
y
Fix git-instaweb
b
r
e
akage on
MacOS X due to th
e
limit
e
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles Bai
l
ey
Fix clone not to ignore depth when perfor
m
ing a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree