repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Teach 'git merge' and 'git pull' the option --ff-only
2009-10-28
Markus Heidelberg
bas
h
c
o
mp
l
e
t
i
on
:
difftool
ac
c
epts the s
a
me opti
o
ns
.
.
.
Signed-off-by:
Markus Heidelberg
<markus.heidelberg@web.de>
commit
|
commitdiff
|
tree
2009-10-25
Markus He
i
de
l
berg
t
7800-d
i
fft
o
ol: fix th
e
e
f
fec
t
less
G
IT_D
I
F
F
TOOL_PROM
P
T
.
.
.
Signed-off-by:
Markus Heidelberg
<markus.heidelberg@web.de>
commit
|
commitdiff
|
tree
2009-06-12
Markus Heidelberg
send-emai
l
: fix a ty
p
o
i
n
a
comment
Signed-off-by:
Markus Heidelberg
<markus.heidelberg@web.de>
commit
|
commitdiff
|
tree
2009-06-12
M
a
rkus Heidelberg
send-email
:
fix thre
a
ded mails withou
t
chain-reply-to
Signed-off-by:
Markus Heidelberg
<markus.heidelberg@web.de>
commit
|
commitdiff
|
tree
2009-06-12
Markus Heidelber
g
add a test
f
or g
i
t-s
e
nd-ema
i
l
for thr
e
aded
m
ails with
o
ut
.
.
.
Signed-off-by:
Markus Heidelberg
<markus.heidelberg@web.de>
commit
|
commitdiff
|
tree
2009-06-12
Mar
k
us
H
e
id
e
l
berg
do
c
/se
n
d-email: clarify the
behavior of --in-
r
eply
.
.
.
Signed-off-by:
Markus Heidelberg
<markus.heidelberg@web.de>
commit
|
commitdiff
|
tree
2009-06-12
M
a
rku
s
Heide
l
berg
send-email: fix non-th
r
eade
d
mai
l
s
Signed-off-by:
Markus Heidelberg
<markus.heidelberg@web.de>
commit
|
commitdiff
|
tree
2009-06-12
Markus Heide
l
berg
add a
test
for gi
t
-send-em
a
il fo
r
non-t
h
readed mails
Signed-off-by:
Markus Heidelberg
<markus.heidelberg@web.de>
commit
|
commitdiff
|
tree
2009-05-24
Markus Heidel
b
erg
git
k
: Allow
d
iff
v
iew
without
c
ontext lines
Signed-off-by:
Markus Heidelberg
<markus.heidelberg@web.de>
commit
|
commitdiff
|
tree
2009-04-26
M
arkus
H
eidelberg
dif
f
: do not color
--stat output like
p
a
t
ch context
Signed-off-by:
Markus Heidelberg
<markus.heidelberg@web.de>
commit
|
commitdiff
|
tree
2009-04-25
M
a
r
kus
H
eidelberg
bash completion:
show-branch colo
r
s
u
p
port
Signed-off-by:
Markus Heidelberg
<markus.heidelberg@web.de>
commit
|
commitdiff
|
tree
2009-04-23
Markus Heidelberg
show-branch: color t
h
e commit statu
s
s
ig
n
s
Signed-off-by:
Markus Heidelberg
<markus.heidelberg@web.de>
commit
|
commitdiff
|
tree
2009-04-21
Ma
r
kus Heide
l
berg
grep: don't support "g
r
ep
.
color"
-
like conf
i
g op
t
io
n
s
Signed-off-by:
Markus Heidelberg
<markus.heidelberg@web.de>
commit
|
commitdiff
|
tree
2009-04-18
Markus Heidelb
e
rg
doc/gi
t
-daemon: ad
d
mi
s
sin
g
ar
g
uments
t
o
max-conne
c
tio
n
s
.
.
.
Signed-off-by:
Markus Heidelberg
<markus.heidelberg@web.de>
commit
|
commitdiff
|
tree
2009-04-18
Markus Heidelb
e
rg
doc/git-d
a
emon: add missing arguments
t
o options
Signed-off-by:
Markus Heidelberg
<markus.heidelberg@web.de>
commit
|
commitdiff
|
tree
2009-04-08
M
ar
k
us Heidelberg
git-merg
e
tool:
a
dd new me
r
ge
tool To
r
to
i
seMerg
e
Signed-off-by:
Markus Heidelberg
<markus.heidelberg@web.de>
commit
|
commitdiff
|
tree
2009-04-08
Markus He
i
delb
e
rg
git-mer
g
eto
o
l/difft
o
ol: make (g)vimdif
f
workable u
n
der
.
.
.
Signed-off-by:
Markus Heidelberg
<markus.heidelberg@web.de>
commit
|
commitdiff
|
tree
2009-04-08
M
arkus Heide
l
berg
d
o
c
/
me
r
ge-config
:
l
i
st ecmerge as a built-i
n
merge
.
.
.
Signed-off-by:
Markus Heidelberg
<markus.heidelberg@web.de>
commit
|
commitdiff
|
tree
2009-04-05
Mar
k
u
s Heidelberg
git-
g
ui (Win): make starting via
"Git GUI
He
r
e" on
.
.
.
Signed-off-by:
Markus Heidelberg
<markus.heidelberg@web.de>
commit
|
commitdiff
|
tree
2009-04-05
M
a
r
kus Heidel
b
er
g
g
i
t-gui (Win): make "Ex
p
lore Workin
g
C
opy" more ro
b
ust
Signed-off-by:
Markus Heidelberg
<markus.heidelberg@web.de>
commit
|
commitdiff
|
tree
2009-04-05
Markus Heidelber
g
git-gui:
u
se `git --html-path` to get the location
.
.
.
Signed-off-by:
Markus Heidelberg
<markus.heidelberg@web.de>
commit
|
commitdiff
|
tree
2009-04-05
Markus H
e
idelbe
r
g
d
o
c/git-pack-refs: fix
t
wo
g
rammar
i
ssues
Signed-off-by:
Markus Heidelberg
<markus.heidelberg@web.de>
commit
|
commitdiff
|
tree
2009-04-05
M
a
rk
u
s
H
eidelberg
add --htm
l
-path
to get the
l
ocation of install
e
d H
T
M
L
.
.
.
Signed-off-by:
Markus Heidelberg
<markus.heidelberg@web.de>
commit
|
commitdiff
|
tree
2009-03-30
Mar
k
us
H
eidelber
g
git-gu
i
: f
i
x del
e
ting fr
o
m the co
n
text
m
enu wi
t
h em
p
ty
.
.
.
Signed-off-by:
Markus Heidelberg
<markus.heidelberg@web.de>
commit
|
commitdiff
|
tree
2009-03-17
Markus Heidelber
g
git-gui: don'
t
h
ide the Browse button w
h
e
n
r
e
sizing
.
.
.
Signed-off-by:
Markus Heidelberg
<markus.heidelberg@web.de>
commit
|
commitdiff
|
tree
2009-02-01
Mark
u
s
Heidelberg
con
t
rib/d
i
ff
t
oo
l
: add suppo
r
t for
K
ompa
r
e
Signed-off-by:
Markus Heidelberg
<markus.heidelberg@web.de>
commit
|
commitdiff
|
tree
2009-01-21
Markus
H
eidelberg
bash completion:
add 're
n
ame' subcommand to git-remote
Signed-off-by:
Markus Heidelberg
<markus.heidelberg@web.de>
commit
|
commitdiff
|
tree
2009-01-20
Markus
H
eidelberg
us
e
up
p
ercase POSIX compl
i
ant signals for the 'trap
.
.
.
Signed-off-by:
Markus Heidelberg
<markus.heidelberg@web.de>
commit
|
commitdiff
|
tree
2009-01-20
Markus Heidelberg
con
t
rib/dif
f
tool: r
e
move distract
i
ng 'echo' in the
.
.
.
Signed-off-by:
Markus Heidelberg
<markus.heidelberg@web.de>
commit
|
commitdiff
|
tree
2009-01-20
Markus H
e
idelbe
r
g
contrib/diff
t
ool
:
chan
g
e
t
r
ap con
d
ition from SIGINT
.
.
.
Signed-off-by:
Markus Heidelberg
<markus.heidelberg@web.de>
commit
|
commitdiff
|
tree
2009-01-18
Markus Heidelberg
merg
e
tool: pu
t
t
he
c
urso
r
on
the editable fi
l
e for
Vi
m
Signed-off-by:
Markus Heidelberg
<markus.heidelberg@web.de>
commit
|
commitdiff
|
tree
2009-01-18
Mar
k
us
H
eid
e
lberg
Documentation:
let asciidoc al
i
gn r
e
lated options
Signed-off-by:
Markus Heidelberg
<markus.heidelberg@web.de>
commit
|
commitdiff
|
tree
2009-01-18
Markus He
i
delb
e
rg
Doc
u
m
en
t
ation: let asciid
o
c
al
i
gn relat
e
d op
t
ions
Signed-off-by:
Markus Heidelberg
<markus.heidelberg@web.de>
commit
|
commitdiff
|
tree
2009-01-13
Markus Heidelberg
contrib/vim: change URL
to point to the latest syntax
.
.
.
Signed-off-by:
Markus Heidelberg
<markus.heidelberg@web.de>
commit
|
commitdiff
|
tree
2009-01-09
Mark
u
s Heidelberg
git-status -v: color diff
o
u
t
put when color
.
ui is set
Signed-off-by:
Markus Heidelberg
<markus.heidelberg@web.de>
commit
|
commitdiff
|
tree
2009-01-09
Marku
s
Heid
e
l
berg
git-c
o
mmit: color
status outp
u
t w
h
en color
.
ui is se
t
Signed-off-by:
Markus Heidelberg
<markus.heidelberg@web.de>
commit
|
commitdiff
|
tree
2009-01-05
Markus Heidelberg
D
ocume
n
tation: clarify which parameters ar
e
optional
.
.
.
commit
|
commitdiff
|
tree
2009-01-01
M
a
rkus Hei
d
elb
e
rg
g
i
t-che
r
ry
:
m
ake
<
upstream> param
e
ter op
t
i
ona
l
Signed-off-by:
Markus Heidelberg
<markus.heidelberg@web.de>
commit
|
commitdiff
|
tree
2008-12-29
Markus Heidelberg
d
o
c
/git-send-em
a
il: menti
o
n sendemail
.
cc co
n
fig
v
ariable
Signed-off-by:
Markus Heidelberg
<markus.heidelberg@web.de>
commit
|
commitdiff
|
tree
2008-12-21
Markus Heidelberg
doc/git-
f
sck: chan
g
e
t
h
e way for ge
t
ting heads'
SHA1s
Signed-off-by:
Markus Heidelberg
<markus.heidelberg@web.de>
commit
|
commitdiff
|
tree
2008-12-21
Markus
H
e
ide
l
berg
D
ocumenta
t
ion/gi
t
-show-branch: work around "single
.
.
.
Signed-off-by:
Markus Heidelberg
<markus.heidelberg@web.de>
commit
|
commitdiff
|
tree
2008-12-20
M
a
rku
s
H
e
i
delberg
Documen
t
ation:
f
ix t
y
p
os, grammar, asc
i
idoc syntax
Signed-off-by:
Markus Heidelberg
<markus.heidelberg@web.de>
commit
|
commitdiff
|
tree
2008-12-20
Mark
u
s Heidelbe
r
g
Documentat
i
o
n: fix t
y
pos, grammar, asciidoc sy
n
t
ax
Signed-off-by:
Markus Heidelberg
<markus.heidelberg@web.de>
commit
|
commitdiff
|
tree
2008-12-19
M
arkus H
e
idelberg
Documen
t
ation: sync exam
p
le o
u
tput with g
i
t o
u
tpu
t
Signed-off-by:
Markus Heidelberg
<markus.heidelberg@web.de>
commit
|
commitdiff
|
tree
2008-12-17
Markus Heidelberg
do
c
/
git-
r
e
set
:
add reference to git-stash
Signed-off-by:
Markus Heidelberg
<markus.heidelberg@web.de>
commit
|
commitdiff
|
tree
2008-12-17
M
a
r
kus
Heidelberg
Docu
m
entatio
n
:
fix de
s
crip
t
i
o
n for
enabling hooks
Signed-off-by:
Markus Heidelberg
<markus.heidelberg@web.de>
commit
|
commitdiff
|
tree
2008-12-13
Markus Heidelb
e
rg
b
ui
l
tin-commit: remove u
n
used mess
a
ge vari
a
ble
Signed-off-by:
Markus Heidelberg
<markus.heidelberg@web.de>
commit
|
commitdiff
|
tree
2008-11-03
M
arkus Heidelberg
M
a
kefile: add
install-man rules (quick
and
n
o
rm
a
l)
commit
|
commitdiff
|
tree
2008-10-31
Markus Heidelberg
bash completion: add doubledash to "git show"
Signed-off-by:
Markus Heidelberg
<markus.heidelberg@web.de>
commit
|
commitdiff
|
tree