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 'sp/maint-push-sideband' into maint-1.6.6
2010-02-20
Thomas Ras
t
che
r
ry_pick_list:
q
uit ear
l
y if one side is empty
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-02-16
T
h
omas Rast
stash
pop: remove 'apply' options during 'drop' invocation
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-12-31
Th
o
mas Rast
ba
s
h
c
omp
l
etion: factor submodules into
dir
t
y state
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-11-21
Thomas Rast
d
e
scribe: do not use unannotate
d
t
a
g
eve
n
if e
x
act
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-11-17
Thomas Rast
Doc
u
m
e
n
t
git-svn's fi
r
st-
p
arent
rule
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-11-17
Tho
m
as Ras
t
rebase docs: clarif
y
--me
r
ge a
n
d
-
-
strat
e
g
y
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-11-15
Thom
a
s Ra
s
t
Documentation: clarify 'ours
'
me
r
g
e
strategy
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-11-13
Tho
m
as Rast
f
il
t
er-branch:
nearest-ance
s
tor rewri
t
ing outside subdir
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-11-13
Thomas Rast
fi
l
t
e
r-bran
c
h: stop special
-
casing $fil
t
e
r
_s
u
bdir argu
m
ent
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-28
T
h
o
mas
Rast
d
e
scribe: wh
e
n
failing, tell the
user about options
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-22
Thomas R
a
st
Quote ' as \(aq in manpages
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-20
T
homas Rast
stash li
s
t: drop the default limit
of 10 stashes
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-20
Tho
m
as Rast
stash list: use n
e
w %g formats instead of
s
ed
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-20
Thomas Rast
Introduce n
e
w
pretty f
o
rmats %g[sdD] for reflog
in
f
o
r
mation
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-20
Thomas Rast
reflog
-
walk: r
e
fac
t
or the branch@{num} formatting
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-20
T
h
o
m
as Rast
Refactor pretty
_
print_commit argu
m
ents i
n
to a struct
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-12
Th
o
mas Rast
Let --d
e
corate show HEA
D
pos
i
tion
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-12
Thomas Rast
bash complet
i
on:
c
omp
l
ete refs for
g
it-grep
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-15
Thomas
Rast
DWIM '
g
i
t
sta
s
h save -p'
for 'git stash -
p
'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-15
Thomas Rast
I
m
p
l
emen
t
'
g
i
t sta
s
h sa
v
e
--
p
atch'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-15
Thomas Ras
t
I
m
plement 'git che
c
kout --patch'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-15
Thoma
s
Ra
s
t
I
mpl
e
ment 'git res
e
t --patch'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-15
T
h
om
a
s Rast
add -p: do
not
attempt t
o
coal
e
sce mode changes
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-14
Thomas Rast
builtin-add: refa
c
t
o
r the meat of
interactive_add()
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-14
Thomas Rast
Add a small patc
h
-mode t
e
sting
library
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-14
Thomas Rast
gi
t
-
apply-
-
interactive: Refa
c
tor patch mode cod
e
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-13
T
h
o
m
as Ra
s
t
g
i
tk: Pa
r
s
e
arbit
r
ary commit-ish in S
H
A1 f
i
eld
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-13
Thomas Rast
gitk:
Fix dir
e
ction
o
f
s
ymmet
r
ic difference in o
p
timize
d
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-13
Thomas
R
ast
g
i
t
k: N
e
w
o
ption
t
o
hide remote refs
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-10
Tho
m
a
s
R
ast
Documen
t
's
t
ash cl
e
ar' recovery via unreach
a
ble commits
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-07-25
Thomas Rast
D
is
a
bl
e
a
s
ciidoc 8
.
4
.
1+ semantics
f
or `{plus}`
a
nd
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-27
Th
o
ma
s
Rast
Test gre
p
-
-
and/--or/--not
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-27
Thomas Ras
t
Test git a
r
chive --remote
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-27
Thomas Rast
Use d
i
e_errno() instead
o
f d
i
e() wh
e
n checking syscalls
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-27
Tho
m
a
s
Rast
Convert existing d
i
e(
.
.
.
, strerro
r
(errno)) to die_errno()
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-27
Thom
a
s Ra
s
t
I
n
t
r
o
duce d
i
e_errno() that
appends strerror(errno
)
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-25
Thomas Ra
s
t
g
i
t
-
svn: let 'dcommit $rev
'
work on $
r
ev
instead of
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-06
Thom
a
s Rast
Documentation
:
refer to
gitwork
f
low
s
(7
)
from tutorial
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-03
Thomas Ra
s
t
add -i: do no
t
dump patc
h
dur
i
ng
application
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-05-31
Thomas Rast
Docu
m
entatio
n
: teac
h
stash
/
pop workflow instead of
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-05-29
T
homas
R
ast
D
ocument
a
t
i
on
:
t
each s
t
ash/pop work
f
low
instead o
f
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-03-30
Thomas Rast
bas
h
completion: only
s
how 'log
-
-merge' i
f
merg
i
ng
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-03-27
Thom
a
s Rast
Docum
e
ntation:
format
-
patch
-
-root clarifications
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-03-12
Thomas Rast
Doc
u
m
ent
a
tion: filter-bran
c
h
:
sh
o
w --ignore-unmatch
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-03-12
Thomas Rast
send-e
m
ail: test
-
-no-
t
hread --in-reply-
t
o combination
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-03-03
Thomas R
a
st
send-email: r
e
spect in-reply-to regardle
s
s of threading
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-22
Thomas Rast
f
o
r
mat-patch:
s
upp
o
rt deep threading
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-22
Thomas
Rast
format
-
p
a
tch:
t
hread as reply to cover
l
etter even
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-22
T
h
omas
Rast
format-patch
:
track
s
ev
e
ral references
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Th
o
mas Rast
Test git
-
patch-id
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
T
homa
s
Rast
Te
s
t
rev-list --parents/--chi
l
dren
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Thomas R
a
st
Tes
t
log --dec
o
r
a
t
e
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Thomas R
a
st
Test fsck a bit harder
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
T
homas
R
ast
Test log -
-
graph
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Thomas Rast
Tes
t
diff --dirstat fu
n
ctionalit
y
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Thoma
s
R
a
st
Test
t
h
a
t d
i
ff can read from std
i
n
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Thomas Rast
Support cov
e
r
age testing with GCC/gc
o
v
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Thomas Rast
f
o
rmat
-
patch: t
h
reading tes
t
rea
c
tivat
i
on
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-18
Thomas Ra
s
t
b
ash
com
p
let
i
on:
o
n
l
y sho
w
'log --merg
e
' if
m
erg
i
ng
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-18
Thomas
R
a
s
t
bash completio
n
: refactor commo
n
log, shortlog
and
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-15
Thom
a
s
Ra
s
t
D
o
cumentati
o
n: pruning rec
i
pe for d
e
structive fil
t
er
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-14
Thomas Ras
t
log
:
do not print ellipses with --abbre
v
-commi
t
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-07
Thoma
s
R
ast
add -p
:
import Term::ReadKey with 'r
e
quire'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-06
T
h
omas Ras
t
add -p: print
e
rrors in separate color
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-06
T
h
omas Rast
ad
d
-p:
prompt for s
i
ngl
e
ch
a
ra
c
ters
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-04
Thomas Rast
co
n
tri
b
git-resurrect: fin
d
traces
o
f a branch name
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-04
Thomas Ra
s
t
add -p: trap Ctrl-D in 'g
o
t
o
'
m
ode
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-04
Thomas Ra
s
t
add -p: change pro
m
pt separa
t
or for 'g'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-04
Thomas Ras
t
b
a
sh: of
f
er to show (un)staged changes
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-02
Thoma
s
Rast
t3412: us
e
log
|
na
m
e-r
e
v instead of log --grap
h
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-31
T
h
oma
s
R
a
st
t3412: clean up GIT_E
D
ITOR
u
sage
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-25
Thomas Rast
t150
5
:
remove deb
u
gging cruft
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-19
Th
o
mas Rast
b
a
sh com
p
let
i
o
n
: refact
o
r
d
if
f
optio
n
s
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-19
Thomas Rast
bash completion:
m
ove pickaxe
opti
o
ns to
l
o
g
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-18
Thomas Ras
t
checkout: imp
l
ement "-" abbr
e
viat
i
o
n
,
a
d
d docs
and
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-18
Th
o
mas Rast
sha1_name: support
@
{-N} syntax in get_sha1(
)
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-18
Thomas
Ra
s
t
s
ha1_n
a
me:
tweak @{-N} lookup
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-17
T
h
omas R
a
st
color-wo
r
d
s
: make r
e
g
e
x
con
f
i
g
urabl
e
via attrib
u
t
e
s
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-17
Thoma
s
Rast
color-word
s
: expand docs with precise s
e
mant
i
c
s
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-17
Thoma
s
Rast
color-words: enable RE
G
_NEWLINE to help user
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-13
Thomas Rast
notes
:
fix core
.
notesRef
d
o
cu
m
entati
o
n
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-12
Thom
a
s Rast
rebase
:
update documentatio
n
f
o
r
--root
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-12
Thom
a
s Rast
rebase
-i: learn
t
o rebas
e
ro
o
t commit
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-12
Tho
m
as Rast
rebase: l
e
a
rn to rebase root com
m
it
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-07
Thomas Rast
diff
-
-no-i
n
de
x
-q:
fix endless lo
o
p
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-07
Thomas Ra
s
t
d
i
ff -
-
n
o
-index:
test for
pager after
opt
i
o
n parsing
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-07
Thomas Ras
t
di
f
f: accep
t
-- when
us
i
ng --no-ind
e
x
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-03
Thoma
s
R
as
t
re
b
ase -i:
exe
c
u
t
e
hook o
n
ly
a
fter argu
m
ent
c
hecking
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-12-07
Tho
m
as
Rast
fetch-pack:
A
void memcpy() with sr
c
=
=dst
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-10-26
Thomas Ra
s
t
a
d
d -p: warn
if only binary changes present
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-10-19
T
homas Rast
Documentation:
add manpage about workflows
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-10-12
Thomas R
a
st
D
o
cumentation:
re
m
ove sta
l
e h
o
w
t
o/re
b
ase-an
d
-ed
i
t
.
txt
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-09-19
Thomas Rast
s
ha1_file: link() retu
r
ns -1
o
n failure,
n
ot errno
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-09-16
Thomas Rast
D
oc
u
mentation: Refer to git-re
b
ase(
1
)
to warn
a
gai
n
st
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-09-16
Thoma
s
Rast
Documenta
t
i
o
n: new upstream re
b
as
e
recovery section
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-09-05
T
h
omas Ra
s
t
git-svn: fi
x
'info' tes
t
s for unk
n
own i
t
em
s
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-09-05
Th
o
mas R
a
st
git-sv
n
: m
a
tch SV
N
1
.
5 behav
i
our of info' on u
n
known
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-09-05
Tho
m
a
s
Rast
git
s
vn info: always
quote URLs
in 'info' output
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-09-05
Thomas Ras
t
git s
v
n info: make info r
e
lative to the
cu
r
re
n
t director
y
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-09-05
Thomas Rast
g
it svn info:
tests:
f
ix ptouc
h
arg
u
ment orde
r
in setup
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
next