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
Merge branch 'cc/for-each-mergetag'
2014-07-21
C
harles Bai
l
e
y
Fix contrib/su
b
t
re
e
Makefile to p
a
tch
#!
l
ine
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
Char
l
es Bai
l
ey
filter-br
a
nch: el
i
minate duplica
t
e ma
p
ped parents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Charles B
a
iley
com
p
at/bswap
.
h: detect endia
n
ness on more pl
a
tforms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Bailey
tests: don't
r
e
ly on
s
trerror text when testing rmdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles B
a
i
ley
d
i
r
.
c: make git_fnmatch() no
t
i
nline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Charles Ba
i
l
e
y
me
r
getool: Remove
e
xplicit re
f
eren
c
es t
o
/
d
e
v
/
tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charles Bai
l
e
y
stash t
e
sts:
stash
c
an lose data i
n
a file remov
e
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bailey
s
tash: Don
'
t
overwrite files that have gone f
r
om the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Char
l
es Bailey
Documenta
t
i
on:
D
e
scribe
other situatio
n
s where -z aff
e
cts
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
Change xdl_merge to generate outp
u
t even for null merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Cha
r
les
B
ailey
t6023: m
e
rge-
f
ile
f
ails to o
u
tput anyt
h
in
g
fo
r
a
deg
e
n
erate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles B
a
iley
mergetool: fix runn
i
ng mergetool
i
n sub
-
directories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles
B
aile
y
mergetool:
A
dd a test for running merg
e
tool i
n
a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
C
h
arles Bailey
mergetoo
l
: re
s
pect au
t
ocrlf by u
s
ing checkout
-
inde
x
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charl
e
s Bai
l
ey
mergetool: Don't
keep tempor
a
ry mer
g
e
f
ile
s
u
nles
s
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles
Bai
l
e
y
m
ergetool: A
d
d
p
rompt to c
o
ntinue af
t
er f
a
i
l
ing
t
o
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
harles B
a
il
e
y
Add
-
y/--no-prompt option
to mergeto
o
l
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles B
a
i
l
ey
Fix some
tab/sp
a
ce inconsistenci
e
s
in
g
i
t
-
mergetool
.
s
h
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
C
harl
e
s Bailey
git-archive: work in bare repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
C
h
a
rles Bailey
M
ake git
archive respe
c
t core
.
autocr
l
f
w
hen c
r
eati
n
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Ch
a
r
les
Bailey
Add
n
ew test to d
e
monstrate git ar
c
hive core
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Ch
a
rle
s
B
a
il
e
y
merge-to
o
l documentatio
n
: describe
c
ustom co
m
m
a
nd usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charl
e
s Ba
i
ley
git-merget
o
o
l
documentaiton: show toolnames in ty
p
ewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
harles
Bail
e
y
Add
a very basic test
sc
r
ipt fo
r
git merge
t
ool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
es
Bailey
T
each git m
e
rgetool to use cust
o
m commands defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Changed an int
e
rnal v
a
riable of
merge
t
ool to
su
p
port
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Tid
y
up git me
r
g
etool's backup fi
l
e
b
e
haviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Bailey
gitk: F
i
x the
M
akefile
t
o
c
ope with systems lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles Bailey
Remove old genera
t
ed files
f
r
om
.
g
i
tignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles Bailey
Fix git-instaweb
break
a
g
e
on M
a
c
O
S X due to
the limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
C
harles
B
ailey
Fix cl
o
n
e
not
to i
g
no
r
e depth when pe
r
forming a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree