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
push.default: Rename 'tracking' to 'upstream'
2011-02-16
J
o
h
an Herland
push
.
default: Rename 'tracking'
t
o 'u
p
stream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
He
r
la
n
d
P
rovid
e
'g
i
t merge --abort'
a
s a
s
ynonym to
'git r
e
set
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
Herland
cmd_m
e
r
g
e
()
:
Parse options befor
e
ch
e
ckin
g
MERGE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Her
l
and
Provide '
g
it notes get-ref'
t
o easily re
t
rieve current
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan
Herland
g
i
t notes
merge: Add testcases for
m
erging note
s
trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
git note
s
me
r
g
e
: Add
anoth
e
r
a
uto-resolving str
a
tegy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
git
notes merge: --commit
s
h
ould fail i
f
underl
y
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
lan
d
git notes merge
:
List conflicting notes in notes
merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herl
a
nd
git notes
m
e
rge: Manu
a
l conflict resolutio
n
, part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git note
s
merge: Manual conf
l
i
c
t resolution, part 1
/
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
Docu
m
entation: Preliminary docs o
n
'git note
s
merge
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
n
o
t
es merg
e
: Add automatic conflict re
s
olvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
a
n
Her
l
and
git notes merge
:
H
a
nd
l
e real, non
-
conflicting no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herlan
d
b
u
iltin/notes
.
c: Refacto
r
cr
e
ation of notes c
o
mmits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
l
and
git
notes merge
:
Initial imple
m
entation handlin
g
trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
builtin/notes
.
c: Spl
i
t notes
r
ef D
W
IMmery into a
s
e
parat
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
not
e
s
.
c: U
s
e two
n
ewlines (
i
nstead of one) when concatenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an
H
erland
(
t
rivial) t3303:
Indent with
t
abs instead of
spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
notes
.
h/c: Propagate combine_not
e
s_f
n
return va
l
ue
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
h
a
n Herlan
d
no
t
es
.
h/c:
A
l
l
o
w combine_notes functions to remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
h
an Herland
n
o
tes
.
c
:
Reorde
r
f
u
nc
t
ions in preparation for next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herlan
d
notes
.
h: Make default_
n
otes_ref(
)
available in notes
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(trivial) notes
.
h:
Minor docum
e
n
tatio
n
fi
x
es
to copy_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Herla
n
d
note
s
.
c
:
Hexi
f
y SHA1
i
n d
i
e() message f
r
o
m init_not
e
s()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Jo
h
a
n
Herl
a
nd
notes: Don't create (empty)
c
o
mmi
t
when removing non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Her
l
and
Enabl
e
cu
s
tom schemes for column colors i
n
the
g
raph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herla
n
d
Make
g
ra
p
h_nex
t
_line()
a
vailabl
e
in the
graph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
r
e
visi
o
n: Turn off history simplification i
n
--ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herla
n
d
revi
s
ion: Fix typo in --an
c
estr
y
-path error me
s
sage
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan He
r
land
Do
c
umentation/rev-list-options
.
txt: Explain --ancest
r
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Do
c
umentatio
n
/
r
ev
-
li
s
t-
o
ptio
n
s
.
txt: Fix missing li
n
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
J
ohan Herland
diff
.
c: Ensure "index $
f
rom
.
.
$to"
li
n
e
contai
n
s unambiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan He
r
land
b
u
i
l
tin-n
o
tes: Min
o
r (mostly
parse_options-related
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Joha
n
Herland
subm
o
dule
s
umm
a
ry: Don't b
a
rf whe
n
invoked in an em
p
ty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bu
i
ltin-not
e
s: Add "cop
y
" subcom
m
and for copying notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
builtin-
n
otes: Mis
c
.
refa
c
toring of argc and exit
v
alue
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Her
l
a
n
d
builtin-notes: A
d
d -c/-C options for
reusing notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
bui
l
tin-notes: Refactor han
d
ling of -F option to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
er
l
a
nd
buil
t
in-no
t
es
:
D
e
precate the
-
m
/-F options for "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
l
and
builtin-n
o
tes: Add "append" sub
c
om
m
and
f
or appen
d
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
b
u
iltin-notes: Ad
d
"add" subco
m
mand
f
o
r add
i
ng no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
built
i
n
-
notes: Add
--messag
e
/--file aliases for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
ha
n
Herland
builtin-notes: A
d
d "list" s
u
bcommand for lis
t
i
n
g note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Documentation: Generaliz
e
git-
n
o
t
es docs to 'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
b
uilt
i
n-n
o
tes
:
Add "prune
"
subco
m
mand for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herla
n
d
Notes AP
I
: prune_n
o
te
s
(): Prune
notes that belo
n
g to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
oh
a
n
Herland
t330
5
: Verify that rem
o
ving
n
otes
triggers automatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
builtin-
n
ot
e
s
: Add "r
e
mov
e
" subco
m
mand f
o
r removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
He
r
land
T
each builtin-
n
otes to remo
v
e empty not
e
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach
n
o
tes c
o
de t
o
properly prese
r
ve non-notes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herl
a
nd
t3305:
V
e
rify that
adding many notes with git-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herla
n
d
t33
0
1:
V
erify succe
s
sf
u
l
annotatio
n
of non-commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
B
uiltin-
i
fy git-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Re
f
act
o
r
n
otes
concat
e
n
ation
into a f
l
exib
l
e in
t
erface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rlan
d
Notes API: Allow mult
i
ple conc
u
rrent notes trees
w
i
th
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
No
t
es AP
I
: write_notes_tr
e
e
(): Sto
r
e
the notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rl
a
nd
N
otes
A
PI:
for_each_note
(
): Traver
s
e the entire
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
N
o
tes
A
PI: get
_
note(): Return the
note ann
o
tating the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Notes
A
P
I: remov
e
_not
e
()
:
Remov
e
note o
b
jects fr
o
m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: add_note(): Add note objects to the in
t
e
rnal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
n
d
Notes A
P
I: init_notes(): Initialize
t
he notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n
H
erland
A
dd tests f
o
r checking correct
handling of $GIT_NOTES_REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
Notes API: g
e
t_c
o
mm
i
t_no
t
es()
-
>
format_note()
+
remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
oh
a
n H
e
rland
M
i
n
or cosmetic
fixes to not
e
s
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
Johan
Herland
bu
i
ltin-config: Fix
c
rash whe
n
using "-f <rela
t
iv
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
A
dd
more testcases
to test
f
a
st-import of notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan
H
erla
n
d
R
enam
e
t
9
301
t
o
t
9350, to make room for m
o
re fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
fast-imp
o
rt:
P
roper notes tree
manipulation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Joh
a
n He
r
land
Fi
x
crasher on
e
nc
o
u
n
t
e
ring SHA1-like
n
on-
n
ot
e
in
no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
J
o
han Herlan
d
Basi
c
bui
l
d
infrastru
c
ture for Python scripts
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Add selftests veri
f
y
i
n
g
c
oncatenation of multip
l
e notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Her
l
a
n
d
Re
f
act
o
r
notes code t
o
concatenate
multiple notes annota
t
i
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joha
n
H
e
rlan
d
A
dd selftests veri
f
yin
g
that we can parse n
o
tes t
r
ees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n
H
erl
a
nd
T
each the no
t
es lookup
code to parse notes trees w
i
th
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan He
r
l
and
Teach
n
ote
s
code
t
o free its intern
a
l data structures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herla
n
d
Add fl
a
gs to get_commit_notes()
t
o control
t
he
for
m
at
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
t3302-notes
-
index-
e
xp
e
n
s
i
ve: Spee
d
up creat
e
_repo(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
fast-import: Add su
p
port for importing commi
t
note
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan H
e
rland
Teach "-m <msg>" and "-F <fi
l
e>" to "git notes edit"
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Johan Herland
git clone: Ad
d
-
-
r
ecursive to au
t
omatically
c
h
e
ckout
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
J
o
h
a
n Herla
n
d
t7407: Use
'
rev-p
a
r
se --sh
o
rt' 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
git s
u
bmodule s
t
atus
:
A
d
d --recu
r
sive to
recurse i
n
to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git submodule update: In
t
roduce
--recu
r
sive to
u
p
d
ate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
g
it submodu
l
e foreach
:
Add --recursi
v
e
t
o re
c
ur
s
e into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herl
a
nd
gi
t
submodul
e
foreac
h
: test
access
to submodule n
a
me
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
Add selftest for 'git s
u
bmodule
foreach'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Her
l
and
g
i
t
submod
u
le: Cl
e
anup us
a
ge s
t
r
ing
and
a
dd option
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-18
J
o
h
an Herland
git submodule foreach:
P
r
ovide access to submodu
l
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-12
J
o
han
Herland
help
.
c:
g
ive correct structure's s
i
ze to memset()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-07-11
Johan Herland
quick
f
etch
(
): Prevent overflow of the rev-list
c
ommand
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
Joh
a
n Herland
g
it-s
u
bmodul
e
:
add support fo
r
--
m
erge
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
Johan Herland
Rename submodule
.
<name>
.
rebase to submodule
.
<name>
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-04-18
Johan Herland
Upda
t
e doc
s
on behaviour of 'core
.
sharedRep
o
sitory
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-03-28
Johan
H
e
rland
M
o
v
e chmod(foo, 0
4
44) into move_temp_to_fil
e
()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-29
Johan Herland
Use s
t
rch
r
n
ul() instead
of strchr() plu
s
manual workaround
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-25
J
o
han
H
er
l
and
Fix submodule sync with relat
i
v
e
subm
o
d
ule URLs
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-25
Johan
H
er
l
and
f
o
r-each-ref: Fix --format=%(subject)
f
or log message
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-04
Johan Her
l
and
Fix AsciiDoc
e
rro
r
s
in
m
erge documenta
t
io
n
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-02
Joh
a
n Herland
Br
i
ng
l
ocal clone's orig
i
n URL i
n
line with that of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-08-21
Joha
n
Herland
T
each "git diff -p" HT
M
L
f
u
ncna
m
e pa
t
terns
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next