repo.or.cz
/
alt-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 'maint-1.7.4' into maint
2011-05-13
Johan
Herland
t54
0
0: Fix a couple of
t
ypos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herland
--dirstat: In case of re
n
ames, u
s
e target filename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Jo
h
an Herland
Teac
h
--dirstat not to comple
t
ely
ignore rearranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herlan
d
--dirst
a
t-by-fil
e
: Make it faster and
m
o
r
e correct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Her
l
and
--d
i
rstat: Describe non-obvious dif
f
e
r
e
nces rel
a
t
i
ve
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Jo
h
an Her
l
and
bra
n
ch/checkout --track: Ens
u
re
t
h
at
u
p
strea
m
branch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Jo
h
an H
e
rl
a
nd
pu
s
h
.
default: Rena
m
e 'tracking'
to
'upstream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Prov
i
de 'git
merge --
a
bort' as a syn
o
nym to 'git
r
eset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
cmd
_
m
e
rge():
P
arse options be
f
ore chec
k
i
ng MERGE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
P
rovide 'git note
s
get-ref' to easily retr
i
eve current
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
git notes m
e
rge:
Add tes
t
cases for merging notes
t
ree
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
n
o
t
e
s
m
erge: Add a
n
other
auto-re
s
olving s
t
rategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
git notes merge: --
c
o
m
m
i
t
shoul
d
fail if un
d
e
rlyi
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
Herland
git notes merge: List co
n
flic
t
ing
n
otes in notes merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
git
notes m
e
rge:
Man
u
a
l
conflict resolut
i
on,
p
art 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herla
n
d
gi
t
note
s
merge: Manua
l
con
f
lict
r
esolution, part 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
Documentation: Preli
m
inary
do
c
s on 'git note
s
merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
git notes merg
e
: Add automatic conflict
r
e
solvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
an
d
gi
t
notes merge: Handle r
e
al, non-conflicting notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
b
uil
t
in/notes
.
c
: Refact
o
r creation o
f
notes commits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge:
Init
i
a
l
i
m
plementatio
n
h
a
ndling tri
v
ial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
bui
l
tin/n
o
tes
.
c:
Split note
s
r
ef DWIMme
r
y
int
o
a separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
c: Use tw
o
new
l
ines
(instead o
f
one) whe
n
concat
e
nat
i
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
(trivial
)
t330
3
: Indent
w
ith t
a
bs
ins
t
e
a
d of sp
a
ces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
notes
.
h/c:
Propagate
c
omb
i
ne_notes_fn return
v
alue
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan H
e
rland
n
o
tes
.
h/c: Al
l
ow combine_notes fu
n
ct
i
ons to
r
e
move
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Herland
notes
.
c: R
e
order f
u
ncti
o
ns in preparation for next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Her
l
and
no
t
es
.
h
:
Ma
k
e
defau
l
t_notes_ref() ava
i
lable in notes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
Herla
n
d
(t
r
i
vial) notes
.
h: Mino
r
documenta
t
i
on f
i
xes to copy_notes(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan
Herland
notes
.
c
:
He
x
ify
S
HA1 in die() message fr
o
m
init_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herl
a
nd
notes:
D
on't create
(
empty) commit
w
he
n
rem
o
ving non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
En
a
ble cust
o
m schemes f
o
r column colors in the graph
A
PI
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
J
o
han Herla
n
d
Make
g
raph_next
_
li
n
e() available in th
e
gra
p
h
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
ohan H
e
rland
r
e
visi
o
n: Turn off histor
y
si
m
plification
i
n
-
-ancestr
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han
Herland
revision:
Fix
t
y
po in -
-
a
n
cestr
y
-pa
t
h error m
e
ssage
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n Herland
Docu
m
entation/
r
ev
-
list-o
p
tions
.
txt:
Expla
i
n
-
-a
n
cestr
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n Herland
Documentati
o
n/rev
-
list
-
op
t
io
n
s
.
txt: Fix missing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Her
l
and
diff
.
c:
E
nsu
r
e "index $from
.
.
$to" line contai
n
s
unambiguo
u
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herland
builtin-notes: Minor
(
most
l
y
parse_optio
n
s-relat
e
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herl
a
nd
submodule summar
y
: Don't barf when invoked in
an e
m
p
t
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
builtin-notes:
Add "copy" subcommand for
c
o
p
y
i
ng
n
ot
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan H
e
rland
builti
n
-
not
e
s:
M
isc
.
refact
o
ring of argc a
n
d
exit
v
alue
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
builti
n
-notes: Add -c
/
-C option
s
for
r
eusing notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
H
erland
b
u
i
lt
i
n-notes: Refa
c
t
o
r
h
andling of -F opt
i
on to allo
w
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
uiltin-notes: D
e
precate the -m/-F o
p
tio
n
s for "g
i
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
builtin-n
o
t
es:
A
d
d "ap
p
end
"
subco
m
mand for
a
ppending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
builtin-notes: Add
"
add"
sub
c
ommand for adding notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bu
i
ltin-n
o
tes: Add --m
e
ssage/--file a
l
i
ases for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
buil
t
i
n
-
n
o
tes: Add
"
l
i
s
t
" subcommand
f
o
r
listing note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
D
ocum
e
ntation: Generalize
git-n
o
tes docs
to 'object
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
buil
t
i
n
-notes: Add "prune" subcommand
for removin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
H
erl
a
nd
N
o
tes
A
P
I: p
r
u
n
e_notes(): Prun
e
notes that belong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t
3
305:
V
erify that remo
v
ing not
e
s
t
rigger
s
automatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-note
s
: A
d
d "r
e
move"
subcom
m
an
d
fo
r
rem
o
vin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Tea
c
h
b
u
i
l
tin-
n
otes to
r
e
m
ove
e
m
p
ty notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
oh
a
n Herland
T
e
ach notes code to properl
y
preserve non-notes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
t3305: Verify t
h
at adding many note
s
w
i
t
h git
-
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Her
l
and
t3301: Verify
s
uccess
f
ul a
n
n
o
t
ation of no
n
-commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
B
ui
l
tin-ify g
i
t-note
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
Re
f
ac
t
o
r notes concatenation into a fl
e
xible interf
a
ce
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herland
N
ote
s
AP
I
: Allow multiple c
o
ncu
r
re
n
t
notes trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
Notes API:
w
rite_n
o
t
e
s_tr
e
e(): S
t
ore
t
h
e note
s
tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
N
o
tes
API: for_each_note()
:
Traverse th
e
e
n
tire notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: get_
n
ote(): R
e
t
u
r
n the
no
t
e annotating t
h
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Notes AP
I
: remove_note(): Rem
o
ve no
t
e
o
b
jects from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
e
rland
No
t
es API: add_note(): Add no
t
e
objects to the intern
a
l
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herl
a
nd
N
o
t
es AP
I
: in
i
t_notes()
:
Init
i
a
l
ize the n
o
tes t
r
ee
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
e
rland
A
dd tests for
checking correct hand
l
i
ng
o
f $GIT_NOTES_REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han H
e
rland
Not
e
s API: get
_
commit_not
e
s() -> format_note() + re
m
ove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an H
e
rland
Minor
cosmetic fixes
t
o notes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
J
ohan
H
e
r
l
a
nd
builtin
-
c
o
n
fig:
F
ix crash when using "-f <r
e
lative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Add more testcase
s
to test fas
t
-
i
mport of notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Rename t930
1
to
t
9350, to make room for more fast-impo
r
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Jo
h
a
n
Herland
fast-impor
t
:
P
roper notes tree
manipu
l
ati
o
n
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Johan
H
erland
Fi
x
crasher o
n
e
nc
o
untering SHA1
-
like non-note in note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Johan Herland
Bas
i
c
b
u
i
ld infrastructure for Python
scrip
t
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
erland
Add selftest
s
verif
y
ing concat
e
nation of multiple notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Her
l
and
Refactor no
t
es code t
o
conc
a
tenate multipl
e
notes annotating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herl
a
nd
Add selft
e
sts verifyi
n
g t
h
at w
e
can p
a
rse notes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joha
n
H
e
rlan
d
Teac
h
t
h
e not
e
s lookup cod
e
to
parse
n
otes trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
oha
n
Herland
Teach notes code to fr
e
e
its internal data st
r
uc
t
ures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
Herland
A
dd
f
l
ags to
g
et_commit_n
o
tes() to control the format
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joha
n
H
e
r
la
n
d
t
3302-n
o
t
es-ind
e
x-
e
xpensive: Speed up cr
e
ate_repo()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan He
r
l
and
fast
-
import: Add support
f
or importin
g
comm
i
t notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Teac
h
"-m <msg>" and "-
F
<
f
i
l
e>" to
"git notes edit"
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Johan Her
l
and
git clone: Add --r
e
c
ursive t
o
automatical
l
y checkout
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Joha
n
Herland
t7407
:
Use 'rev-parse --s
h
or
t
' rather than bash's sub
s
t
rin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git submodule stat
u
s:
A
dd
-
-recu
r
sive
t
o rec
u
rs
e
into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan H
e
rland
git s
u
bmodule update: Intro
d
uce
--recursive to update
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git s
u
b
m
odul
e
f
o
reac
h
: Add --r
e
curs
i
v
e
to r
e
curse into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git submo
d
u
le foreach: tes
t
access to submodule n
a
me
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Her
l
a
n
d
Add selftest for 'git su
b
module for
e
ac
h
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan
Herl
a
nd
git submodule: Cleanup
usage
string and a
d
d
option
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-18
Joh
a
n Herland
gi
t
submodule f
o
reach: Provide ac
c
e
s
s to submodule
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-12
Johan
Herl
a
nd
h
elp
.
c: give corr
e
ct structure's
siz
e
to memset(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-07-11
Jo
h
a
n
H
erla
n
d
quic
k
fetch(): Prevent
o
verf
l
ow
o
f th
e
r
e
v-list command
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
Johan Herland
git-submod
u
le: add support for --me
r
ge
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
Jo
h
an Herland
Ren
a
me submodule
.
<name
>
.
rebase
t
o
submodule
.
<name>
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-04-18
Johan Herla
n
d
Up
d
ate docs o
n
behaviour of 'core
.
sharedRepositor
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-03-28
Johan Herland
Move
chmod(foo, 0444) into move_temp_to_file()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next