repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'maint-1.5.6' into maint
2009-01-18
Ste
p
h
an Beyer
git
h
ook
s
.
t
x
t
: add missi
n
g word
Signed-off-by:
Stephan Beyer
<s-beyer@gmx.net>
commit
|
commitdiff
|
tree
2009-01-18
St
e
ph
a
n Beyer
b
u
iltin-
c
ommit
.
c
:
do not r
e
mov
e
COMMI
T
_EDITM
S
G
Signed-off-by:
Stephan Beyer
<s-beyer@gmx.net>
commit
|
commitdiff
|
tree
2009-01-15
Stephan Beyer
t34
0
4: Add test case for auto
-
amen
d
i
n
g
only edit
e
d
.
.
.
Signed-off-by:
Stephan Beyer
<s-beyer@gmx.net>
commit
|
commitdiff
|
tree
2009-01-15
Stephan Bey
e
r
t3404: Add test ca
s
e for aborted
--continue af
t
er
.
.
.
Signed-off-by:
Stephan Beyer
<s-beyer@gmx.net>
commit
|
commitdiff
|
tree
2009-01-15
Step
h
an Beyer
t3501: che
c
k that c
o
m
m
its are actually d
o
ne
Signed-off-by:
Stephan Beyer
<s-beyer@gmx.net>
commit
|
commitdiff
|
tree
2008-08-31
S
t
ephan Beyer
mer
g
e-r
e
cursive
.
c: Add more ge
n
e
r
ic
m
erge_r
e
cursive_generic()
Signed-off-by:
Stephan Beyer
<s-beyer@gmx.net>
commit
|
commitdiff
|
tree
2008-08-17
Stephan
B
eye
r
Fix co
m
mit_tree() buf
f
er
l
eak
Signed-off-by:
Stephan Beyer
<s-beyer@gmx.net>
commit
|
commitdiff
|
tree
2008-08-17
Stephan Bey
e
r
Improve error ou
t
put of git
-
rebase
Signed-off-by:
Stephan Beyer
<s-beyer@gmx.net>
commit
|
commitdiff
|
tree
2008-08-16
Stephan
B
eyer
git-stash:
improve
s
y
n
opsi
s
in
h
elp and manu
a
l page
Signed-off-by:
Stephan Beyer
<s-beyer@gmx.net>
commit
|
commitdiff
|
tree
2008-08-16
Step
h
an Beyer
gi
t
-am:
i
g
n
ore
--bin
a
ry
o
pti
o
n
Signed-off-by:
Stephan Beyer
<s-beyer@gmx.net>
commit
|
commitdiff
|
tree
2008-08-02
S
t
e
p
han
B
eyer
builtin-rev
e
rt
.
c: typo
f
i
x
Signed-off-by:
Stephan Beyer
<s-beyer@gmx.net>
commit
|
commitdiff
|
tree
2008-07-26
S
tephan Beyer
git
-
reset: Let -q hush
"
locally
m
od
i
fied" messag
e
s
Signed-off-by:
Stephan Beyer
<s-beyer@gmx.net>
commit
|
commitdiff
|
tree
2008-07-26
Stephan Beyer
git-am
:
Mention --abort in usage s
t
ring part of
O
PTIONS_SP
E
C
Signed-off-by:
Stephan Beyer
<s-beyer@gmx.net>
commit
|
commitdiff
|
tree
2008-07-26
Stephan Beyer
e
ditor
.
c
:
Libify l
a
u
nc
h
_editor()
Signed-off-by:
Stephan Beyer
<s-beyer@gmx.net>
commit
|
commitdiff
|
tree
2008-07-26
Ste
p
han Be
y
er
Move launch_e
d
itor()
f
rom
bui
l
tin
-
t
a
g
.
c t
o
editor
.
c
Signed-off-by:
Stephan Beyer
<s-beyer@gmx.net>
commit
|
commitdiff
|
tree
2008-07-24
Stepha
n
B
e
yer
Make non-static fun
c
t
i
ons, t
h
at m
a
y be
st
a
tic,
s
tatic
Signed-off-by:
Stephan Beyer
<s-beyer@gmx.net>
commit
|
commitdiff
|
tree
2008-07-23
Stephan Beyer
a
m
--abort: Add to bash-completion and mention
in git
.
.
.
Signed-off-by:
Stephan Beyer
<s-beyer@gmx.net>
commit
|
commitdiff
|
tree
2008-07-23
Stephan Beyer
git-am: Add colon b
e
fore the subject t
h
at is printed
.
.
.
Signed-off-by:
Stephan Beyer
<s-beyer@gmx.net>
commit
|
commitdiff
|
tree
2008-07-19
Stephan Beyer
Link git-shell
o
nly
t
o a
su
b
set of libgi
t
.
a
Signed-off-by:
Stephan Beyer
<s-beyer@gmx.net>
commit
|
commitdiff
|
tree
2008-07-18
Stephan Beyer
api-run-
c
o
m
m
a
nd
.
txt: typ
o
fix
Signed-off-by:
Stephan Beyer
<s-beyer@gmx.net>
commit
|
commitdiff
|
tree
2008-07-16
Stephan Be
y
er
rebase-i: keep old pa
r
ents when p
r
eserving merge
s
Signed-off-by:
Stephan Beyer
<s-beyer@gmx.net>
commit
|
commitdiff
|
tree
2008-07-13
S
t
e
p
han Be
y
er
Make
r
e
base--interactive
u
se OP
T
I
O
NS_SPEC
Signed-off-by:
Stephan Beyer
<s-beyer@gmx.net>
commit
|
commitdiff
|
tree
2008-07-13
S
tephan Beyer
t
3
4
04: test two
"preserve
m
erges with -
p
" cases
Signed-off-by:
Stephan Beyer
<s-beyer@gmx.net>
commit
|
commitdiff
|
tree
2008-07-13
Stephan Beyer
g
i
t-am/g
i
t
-mails
p
lit: cor
r
ect synopsis for
readi
n
g
.
.
.
Signed-off-by:
Stephan Beyer
<s-beyer@gmx.net>
commit
|
commitdiff
|
tree
2008-07-13
Ste
p
h
an Bey
e
r
Make usage strings dash-les
s
Signed-off-by:
Stephan Beyer
<s-beyer@gmx.net>
commit
|
commitdiff
|
tree
2008-07-13
Stephan Beyer
t/: Use
"test_must_fail git"
i
n
s
tead of "! gi
t
"
Signed-off-by:
Stephan Beyer
<s-beyer@gmx.net>
commit
|
commitdiff
|
tree
2008-07-13
Stepha
n
Beyer
t/test-
l
i
b
.
sh:
e
x
i
t with
s
mall
n
egagive int
i
s
ok with
.
.
.
Signed-off-by:
Stephan Beyer
<s-beyer@gmx.net>
commit
|
commitdiff
|
tree
2008-07-13
S
t
e
p
han Beyer
git
-
am: Do not e
x
it silen
t
ly if c
o
mmit
t
er i
s
un
s
et
Signed-off-by:
Stephan Beyer
<s-beyer@gmx.net>
commit
|
commitdiff
|
tree
2008-07-10
Stepha
n
Beyer
rer
e
re
:
Separate libgit and builtin
fu
n
ctions
Signed-off-by:
Stephan Beyer
<s-beyer@gmx.net>
commit
|
commitdiff
|
tree
2008-06-23
Stephan Beyer
E
xtend parse-o
p
ti
o
ns t
e
st s
u
i
te
Signed-off-by:
Stephan Beyer
<s-beyer@gmx.net>
commit
|
commitdiff
|
tree
2008-06-23
S
tep
h
an Beyer
api-parse-option
s
.
txt: Introduce documentation for
.
.
.
Signed-off-by:
Stephan Beyer
<s-beyer@gmx.net>
commit
|
commitdiff
|
tree
2008-06-23
Stephan Beyer
a
p
i
-
builtin
.
t
xt: update and
f
ix
ty
p
o
Signed-off-by:
Stephan Beyer
<s-beyer@gmx.net>
commit
|
commitdiff
|
tree
2008-06-23
St
e
phan
B
ey
e
r
g
i
t-reba
s
e
.
s
h
: Add check if rebase is in pr
o
gress
Signed-off-by:
Stephan Beyer
<s-beyer@gmx.net>
commit
|
commitdiff
|
tree
2008-06-23
Steph
a
n Beyer
t
3404: stricter tests
for g
i
t
-rebase--inte
r
active
Signed-off-by:
Stephan Beyer
<s-beyer@gmx.net>
commit
|
commitdiff
|
tree
2008-06-23
Steph
a
n Beyer
api-built
i
n
.
t
xt:
u
pdate and
fix typo
Signed-off-by:
Stephan Beyer
<s-beyer@gmx.net>
commit
|
commitdiff
|
tree
2008-06-08
Stephan Beyer
git-n
a
me-rev
.
tx
t
: document --no-und
e
f
ined an
d
--alw
a
ys
Signed-off-by:
Stephan Beyer
<s-beyer@gmx.net>
commit
|
commitdiff
|
tree
2008-06-08
Stephan
B
eyer
gi
t
-describe
.
txt: document -
-
alw
a
ys
Signed-off-by:
Stephan Beyer
<s-beyer@gmx.net>
commit
|
commitdiff
|
tree
2008-06-08
Stephan Beyer
Docs: add
s
o
me long/shor
t
optio
n
s
Signed-off-by:
Stephan Beyer
<s-beyer@gmx.net>
commit
|
commitdiff
|
tree
2008-06-08
Ste
p
h
an
B
eyer
Doc
s
: Use "-l::\n--lo
n
g\
n
" format in OPTIONS sec
t
ions
Signed-off-by:
Stephan Beyer
<s-beyer@gmx.net>
commit
|
commitdiff
|
tree
2008-06-08
Steph
a
n Bey
e
r
git-co
m
mit
.
txt: Add m
i
ssin
g
lon
g
/sh
o
rt opt
i
o
ns
Signed-off-by:
Stephan Beyer
<s-beyer@gmx.net>
commit
|
commitdiff
|
tree
2008-06-08
S
t
e
phan
Beyer
g
it
-
commit
.
txt
:
Correct option
a
lterna
t
ives
Signed-off-by:
Stephan Beyer
<s-beyer@gmx.net>
commit
|
commitdiff
|
tree
2008-05-31
Ste
p
han Be
y
er
Merge t4150-am-subdir
.
sh and
t
4
1
5
1
-
a
m
.
sh into t4
1
5
0
.
.
.
Signed-off-by:
Stephan Beyer
<s-beyer@gmx.net>
commit
|
commitdiff
|
tree
2008-05-31
Stephan Beyer
Add test ca
s
es for git-am
Signed-off-by:
Stephan Beyer
<s-beyer@gmx.net>
commit
|
commitdiff
|
tree
2008-04-15
Step
h
an Beyer
built
i
n-app
l
y
.
c
:
use git_config_string() t
o
get apply_d
e
faul
.
.
.
Signed-off-by:
Stephan Beyer
<s-beyer@gmx.net>
commit
|
commitdiff
|
tree