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
remote: allow "-t" with fetch mirrors
2011-02-16
Johan Herlan
d
pu
s
h
.
def
a
ult: Rename
'
tr
a
cki
n
g
'
to
'upst
r
e
a
m'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herl
a
n
d
Provide 'git merge --abort' as a sy
n
onym
t
o 'gi
t
re
s
et
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
cmd_merge():
Parse opti
o
ns be
f
ore che
c
king MERGE_
H
EAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
Provide 'git no
t
es get-ref' to easi
l
y
retri
e
ve curre
n
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
n
otes merge
:
Add te
s
tcases for merging notes
t
rees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
git n
o
tes merge: Ad
d
a
no
t
her auto-r
e
s
olving strateg
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rla
n
d
g
i
t notes merge: --commit sho
u
ld f
a
i
l
i
f underlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: List confl
i
ct
i
n
g
notes
i
n note
s
me
r
ge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
a
n
d
git notes merge:
M
a
n
u
a
l conflict resolution, part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Manual conflict resolution, part 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
Do
c
umentation: Preliminary docs on 'git notes merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
H
erland
gi
t
notes
m
erge: Add au
t
omatic con
f
lict re
s
olver
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
g
i
t notes merge: Handl
e
real,
n
on-
c
onf
l
icting no
t
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
a
n
Herl
a
nd
builti
n
/notes
.
c:
R
efactor creat
i
o
n
of notes
c
ommits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes
merg
e
:
Ini
t
ial implementation handling trivia
l
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herla
n
d
built
i
n/notes
.
c
: Split not
e
s ref DWIMmery into a
s
e
p
arate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
no
t
e
s
.
c: Use
two newlines (instead of o
n
e) when
c
onca
t
e
natin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
(trivial) t3
3
03
:
Indent with
t
ab
s
instead of spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herlan
d
notes
.
h/c: Propagat
e
c
o
mbi
n
e
_
notes_fn return val
u
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
oh
a
n
Herlan
d
notes
.
h/c: Allow combine_
n
otes f
u
nctions to remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan H
e
rla
n
d
no
t
es
.
c
:
Reorder functions
i
n preparat
i
on for next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan
Herland
notes
.
h: Ma
k
e default_notes_ref
(
) a
v
ailable in notes
A
PI
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan
H
erland
(tri
v
ial) notes
.
h
: Minor documentatio
n
f
i
xes to co
p
y_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan Herland
notes
.
c
:
H
e
x
if
y
SHA1
in die() message
f
rom init_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan He
r
land
notes: Don't create (empt
y
) commit when remov
i
n
g
non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
J
o
han Herla
n
d
Enabl
e
custom schemes
for column colors in the gra
p
h
A
PI
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Make
gr
a
ph_next_line() available in t
h
e
g
raph
.
h
A
PI
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
rev
i
sion: Turn of
f
histo
r
y
s
im
p
lification in --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Her
l
and
rev
i
s
i
on
:
Fix
t
yp
o
in --ancestry-path
e
rr
o
r
messa
g
e
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Jo
h
a
n Herland
D
o
cumen
t
ati
o
n/
r
ev-list-options
.
txt: Explain --ance
s
try
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
D
ocumen
t
ation/rev-l
i
st-options
.
t
xt: Fix mis
s
ing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
J
ohan Herland
dif
f
.
c: E
n
s
u
r
e "index $from
.
.
$to"
l
ine c
o
nt
a
i
ns unambiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herland
builtin-note
s
: Min
o
r
(mo
s
tly parse_options-related
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
J
o
h
an Herland
submodule summary: Do
n
't ba
r
f
when invoke
d
i
n
an
empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
buil
t
in-
n
otes:
A
dd "co
p
y" su
b
command for copying notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Misc
.
refactori
n
g of ar
g
c and ex
i
t v
a
lue
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
iltin-n
o
tes: Add -c/
-
C options
f
or re
u
s
ing notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-note
s
: Refactor handlin
g
of -F option to
a
llow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
H
erl
a
nd
builtin-
n
o
t
es: Deprecate the -m/-F
options for "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bui
l
t
i
n-notes: Add "append" subcommand
for appending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes:
A
d
d "
a
dd" su
b
comma
n
d for addin
g
not
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n H
e
r
l
and
buil
t
in-notes: Add
-
-message/--file aliases for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bui
l
t
i
n
-notes
:
Ad
d
"list" subcommand for l
i
s
ting
no
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herl
a
nd
Documentation: Gen
e
ralize git-notes do
c
s to
'
o
bje
c
ts
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
builtin-not
e
s
:
Add "prune" subcomm
a
nd fo
r
rem
o
ving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herl
a
nd
N
o
tes
API:
prune
_
n
otes
(
):
P
r
u
ne
notes
that
b
elong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
t3305: Verify that removing
n
otes triggers au
t
omatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
Herlan
d
b
uiltin-notes:
Add "remove
"
subcommand for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
T
each builtin-notes to r
e
move empty no
t
es
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Te
a
ch notes code to properly
preser
v
e non-n
o
tes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
t3305: Verify that addin
g
m
an
y
notes with gi
t
-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3301:
V
erify s
u
c
c
essfu
l
annota
t
ion of n
o
n-commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Bu
i
lti
n
-ify git-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Refactor notes concatenatio
n
into a
f
lexible inte
r
f
a
ce
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
la
n
d
Notes API: A
l
low
multiple concurrent notes trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
lan
d
Not
e
s API
:
write_notes_t
r
e
e
(
): Store the notes
tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Her
l
an
d
Not
e
s API: f
o
r_each_note()
:
Traverse the entire notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
r
land
Notes API:
get_n
o
te(): Return the
n
o
t
e annot
a
ting the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Note
s
API: remove_note(): Remove
n
o
t
e
objects from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Notes API: add
_
n
o
te
(
): Add note ob
j
ects to
t
he in
t
ernal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Note
s
API: init_
n
otes(): Initialize
t
h
e
notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Add tests for chec
k
ing correct handling of $
G
IT_NOT
E
S
_
REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: get_commit_note
s
() -> fo
r
m
a
t_note()
+
r
e
m
ove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Her
l
and
Min
o
r
cosm
e
tic fixes to notes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
J
o
han Herland
buil
t
in-
c
onfig:
F
i
x
cra
s
h
whe
n
usin
g
"-f <relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Add
more testcases to
t
es
t
fast-im
p
ort of notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Rename t9301 to t9350,
to make room for more
f
ast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
J
o
h
an Herla
n
d
fast-import: Prop
e
r notes
t
ree ma
n
ipulation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Joha
n
H
er
l
and
Fi
x
c
rasher on encountering
S
HA1-li
k
e non-note in
note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Joh
a
n
He
r
land
B
a
sic build infrastructure for Py
t
hon s
c
ripts
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan He
r
land
Add se
l
f
tests v
e
rifying concatenation
o
f
multiple notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n Herland
Refac
t
or
n
otes code
to concaten
a
te m
u
l
t
i
p
le notes annotat
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han Herland
Add s
e
lf
t
e
sts ve
r
i
f
ying
t
hat
we
can p
a
rse not
e
s
t
rees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herla
n
d
Teach
the notes
l
ookup
c
ode to parse notes trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Teach
n
o
te
s
code to free its int
e
rnal da
t
a
s
tructures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herl
a
nd
Add flags to
g
e
t
_
c
o
mmi
t
_
n
o
t
es() to control the
format
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herla
n
d
t3302-notes-index-expensive:
S
peed up create
_
rep
o
()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
fa
s
t-import: Add
support for import
i
ng c
o
mmit notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Teach
"-m <msg>" and "-F <f
i
l
e
>" to
"
git n
o
tes edit"
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
J
ohan
Herland
g
i
t clone: Add
-
-recursi
v
e
to autom
a
tically checkout
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Johan Herland
t
7407:
U
s
e
'rev-parse --short' rath
e
r than bash's substring
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan H
e
rland
g
it su
b
module statu
s
: Add
--recu
r
sive to rec
u
r
se into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git submo
d
ule
u
pdat
e
: Introduce --recursive to up
d
ate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git
s
u
bmodule
for
e
ach: Add --recursive to recurse i
n
to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Jo
h
an Herland
git submodule fo
r
each: test acces
s
to submodule name
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
Add selftest for
'
git submodule foreach
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan H
e
rland
gi
t
subm
o
dule: Cleanup u
s
a
g
e
strin
g
and add
option
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-18
Johan Herland
git submodule fo
r
each: Provide access to submodule
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-12
Johan
Herland
h
elp
.
c
:
give correct structure's size to memset(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-07-11
Johan He
r
land
q
u
ickfe
t
ch(): Prevent overflow o
f
t
he rev-l
i
st command
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
Johan H
e
rland
git
-
sub
m
odul
e
: ad
d
s
u
pport for --merge
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
J
o
han Herland
Ren
a
m
e
submodule
.
<
n
ame>
.
rebase to submodule
.
<na
m
e>
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-04-18
Johan Herland
Up
d
at
e
docs on
b
ehaviour of 'core
.
sharedReposi
t
ory
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-03-28
Johan
Herla
n
d
Move chmod(foo, 04
4
4)
into
move_temp_
t
o_fi
l
e()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-29
Johan Her
l
and
Us
e
strchrn
u
l
(
)
instead of strch
r
(
) plus man
u
al workaround
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-25
Johan
Herlan
d
Fix
s
ubmodule sync with relative submodule
U
R
Ls
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-25
Johan Herland
for-each
-
ref: Fi
x
--
f
o
rmat=%(sub
j
ect) for log message
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-04
Johan
Herla
n
d
F
i
x
AsciiDo
c
errors in
merge documentation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-02
Johan Herland
Bring local clone's
origin URL in
li
n
e with th
a
t of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-08-21
Johan Herland
Teach "git diff
-p"
H
TML funcname
p
atte
r
ns
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next