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
Provide 'git notes get-ref' to easily retrieve current notes ref
2010-11-17
Johan Herland
Provide
'
git
notes get-ref
'
to easi
l
y
r
etri
e
ve c
u
rrent
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Her
l
and
git
n
o
tes merge:
Add te
s
t
c
ases for mergi
n
g notes trees
.
.
.
Thanks-to: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
Herland
git notes m
e
rge:
Add anot
h
e
r
auto-resol
v
ing st
r
ategy
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
it notes
m
e
rge: --comm
i
t should fail if underlying
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rl
a
n
d
git notes
merge: List conflicting notes in not
e
s
mer
g
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an He
r
land
git notes me
r
ge:
Manual conflict r
e
solution, part
2/2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
git notes merge
:
Man
u
al conflict
r
e
solution,
par
t
1/
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
Documentation:
P
r
e
liminary d
o
cs on 'git n
o
tes merge'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
a
n H
e
rl
a
nd
git notes
me
r
ge: Add automatic conflict resolvers
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
it notes merge: Handle r
e
al,
non-c
o
nflictin
g
notes
.
.
.
Thanks-to: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herlan
d
bui
l
tin/n
o
tes
.
c:
Refactor
c
re
a
tion of notes c
o
mmi
t
s
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
git n
o
tes merge:
I
nitial implementation h
a
ndling triv
i
al
.
.
.
Thanks-to: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
builtin/notes
.
c: Split no
t
es ref
D
W
IMmer
y
i
n
to
a
separ
a
t
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
n
otes
.
c
:
Use
t
w
o newlines (instead of one) when conc
a
tenat
i
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herlan
d
(tr
i
vial) t33
0
3
:
Inde
n
t with tabs i
n
stead of sp
a
ces
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
n
otes
.
h
/
c: P
r
op
a
gate combine_
n
ot
e
s_fn return valu
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herl
a
nd
notes
.
h/
c
: Allow combine_notes f
u
nctions to re
m
ove
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herl
a
n
d
n
o
tes
.
c:
Reorder
function
s
in p
r
epa
r
a
t
ion for ne
x
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n He
r
land
notes
.
h
:
Make default_notes_ref() avail
a
ble
i
n notes AP
I
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(trivial) no
t
e
s
.
h: Minor docume
n
t
a
ti
o
n fixes to copy_n
o
tes(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
J
o
h
a
n
Herl
a
n
d
notes
.
c
: Hexify SHA1 in
d
i
e() mes
s
age fr
o
m init_notes(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
René Scharfe
notes
:
al
l
ow -
-
d
r
y
-run for -n a
n
d -
-
verbos
e
for -v
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Matthie
u
Moy
D
o
c
ument -B<
n
>[
/
<m>
]
, -M<n> a
n
d -C<n> variants of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Bra
d
Ki
n
g
Docu
m
enta
t
ion: cite git
-
a
m
f
rom
g
it-app
l
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
T
h
omas Rast
t70
0
3:
fix subdirectory-f
i
lt
e
r test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan
N
i
eder
A
ll
o
w "che
c
k-ref-f
o
rma
t
--branc
h
" fro
m
subdirecto
r
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nieder
check-ref-format: handle
s
ubcommands in separate functions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-05
M
a
tthieu M
o
y
pretty-
o
ptions
.
txt
:
m
atch --format'
s
d
ocument
a
ti
o
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-03
J
unio C Hamano
M
e
rge branch 'sv/mai
n
t-diff
-
q-cle
a
r-fix' into maint
commit
|
commitdiff
|
tree
2010-08-03
Junio C Hamano
Me
r
ge b
r
anch 'rr/svn-fe' into ma
i
nt
commit
|
commitdiff
|
tree
2010-08-03
Junio C
H
amano
M
erge branc
h
'
pt/git
-
gui' into main
t
commit
|
commitdiff
|
tree
2010-08-03
Ra
m
kumar Ram
a
chandr
a
contr
i
b/svn-
f
e:
A
dd the svn-fe targe
t
to
.
git
i
gnore
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-03
Ramk
u
m
a
r Ramachandra
co
n
t
r
ib/svn
-
fe: Fi
x
Inc
l
udePath
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Juni
o
C Hamano
Me
r
ge branch 'ab/tap' int
o
maint
commit
|
commitdiff
|
tree
2010-08-02
Ævar
A
rnfjörð Bjarm
a
son
te
s
t-lib: Remove 3 ye
a
r old no-op --
n
o-python
o
pti
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Ævar Arnfjörð Bj
a
rmason
test-lib:
I
gnore --qu
i
e
t unde
r
a TAP harness
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Ju
n
io
C
Ham
a
no
Mer
g
e g
i
t://re
p
o
.
or
.
cz/git-gui into
pt/git-gui
commit
|
commitdiff
|
tree
2010-08-02
Thomas Rast
Documentat
i
on/rev-parse:
q
uoti
n
g
is re
q
uir
e
d
w
i
t
h
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Junio C Hamano
D
o
cum
e
ntat
i
on: reportin
g
bugs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Junio C Hamano
Fix DI
F
F
_QUEUE_CLEAR r
e
f
act
o
ring
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-28
David D
.
K
i
lzer
Fix git
re
b
a
s
e --continue to wo
r
k wit
h
touched
f
iles
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-28
M
atthieu Moy
D
o
cument ls-files -t as
s
em
i
-obsol
e
t
e
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Junio C
H
amano
Git 1
.
7
.
2
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
J
u
nio C Hamano
Syn
c
w
ith 1
.
7
.
1
.
2
commit
|
commitdiff
|
tree
2010-07-27
Junio C Ham
a
n
o
Git 1
.
7
.
1
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Junio C H
a
m
ano
Sync with 1
.
7
.
0 series
commit
|
commitdiff
|
tree
2010-07-27
Juni
o
C Ha
m
an
o
Git
1
.
7
.
0
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Jo
n
a
than N
i
e
d
er
c
on
f
ig
-
-
get --pa
t
h:
chec
k
f
o
r
u
n
set $HOME
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Stephen Boyd
commit: remove full
stop
from
u
sag
e
help for
-
u
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Matth
i
eu
M
oy
Clar
i
fy
help message w
h
en no remote is specifi
e
d in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Thomas
Rast
Makefile: add
c
heck-docs exception
f
or gi
t
r
evisions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Thoma
s
Ras
t
Fix 'git' wrapper usage s
t
ri
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Tho
m
as Ras
t
D
ocumentation/git
-
push: Expl
a
i
n stat
u
s output in more
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Thomas Rast
Docu
m
ent recei
v
e
.
den
y
D
e
leteCurre
n
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Thomas Rast
Cast execl*() NULL s
e
ntinels to
(cha
r
*
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
N
g
u
yễn Thái N
g
ọc Duy
git-r
e
ad-tree
.
tx
t
: acknowl
e
dge the d
i
rectory matching
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Jon Seymour
INSTALL: c
o
nfigu
r
e
/
e
tc/x
m
l/cat
a
log to buil
d
docs on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
J
ohannes Sixt
t
3
700-ad
d
:
fix dependence on stdout and stderr buffering
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
B
randon Ca
s
ey
git-r
e
base--interactiv
e
.
s
h: use print
f
inste
a
d
o
f echo
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Nathan W
.
P
a
nike
A
dd a google-chrom
e
opt
i
on for w
e
b--browse
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Junio C Hama
n
o
M
e
r
ge branch 'ma
i
n
t-1
.
7
.
1
'
into mai
n
t
commit
|
commitdiff
|
tree
2010-07-26
Junio C Hamano
Mer
g
e branc
h
'maint-1
.
7
.
0' into main
t
-
1
.
7
.
1
commit
|
commitdiff
|
tree
2010-07-26
Jun
i
o
C Hamano
Merge
branch 'm
a
i
n
t-1
.
6
.
6
' into maint-1
.
7
.
0
commit
|
commitdiff
|
tree
2010-07-26
Junio C
Ham
a
no
Merge
b
ranch
'
maint-1
.
6
.
5
'
into
m
aint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-07-26
Stephen
B
oyd
request-pull
.
txt:
D
ocument
-
p opt
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Junio C Hamano
Merge branch 'maint-
1
.
6
.
4' into
m
a
i
nt-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-07-25
Greg B
r
ockman
Check size of path buffer before writ
i
ng into it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Junio C H
a
m
ano
Git 1
.
7
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Junio C
Hamano
tests
:
correct "does re
f
log exist?" tes
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Bra
n
d
on Casey
t/: work aroun
d
one-sho
t
v
a
riable assignment wi
t
h
test_must_fail
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Jon
a
than Nieder
t
/
README: correct an exception when break
i
ng a &
&
c
hain
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Brandon Casey
t/{t5
5
41,lib-httpd}: replace prob
l
ematic '!()' notation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Brando
n
C
asey
t/t3700:
c
onvert two uses of negat
i
on operator '!'
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
J
unio C Ham
a
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-20
Brandon Casey
t/README: clarif
y
test_must_fail des
c
ript
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Greg Brockman
C
h
e
ck size of
p
a
th buffer before writing
into it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
J
unio C Hamano
M
e
rge bra
n
ch 'm
a
int'
commit
|
commitdiff
|
tree
2010-07-19
Ralf Thielow
upd
a
te-se
r
ver-
i
n
f
o: Shorten read_pack_info_fil
e
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ævar
A
rn
f
jörð Bj
a
rmaso
n
git add: Add --ignore-
m
issing to SY
N
OP
S
I
S
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Æva
r
Ar
n
f
j
ör
ð
Bjarma
s
o
n
git submod
u
l
e a
d
d: R
e
move old docs ab
o
ut implicit
-
f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Jens Lehma
n
n
g
it submodule add: Require the new --force
o
pti
o
n to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Jun
i
o C Hamano
Merge branch '
j
l/add-n-ignore-
m
i
s
sing
'
commit
|
commitdiff
|
tree
2010-07-19
Da
v
i
d
Aguilar
Docume
n
tati
o
n:
E
x
plain git-mergetool's use of
temporary
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
J
u
nio C Hamano
Merg
e
branch 'j
c
/d
i
ff-merge-ba
s
e-multi'
commit
|
commitdiff
|
tree
2010-07-16
Thomas R
a
s
t
Only
run aggregate-resul
t
s ove
r
actual counts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
J
onath
a
n Nieder
A
d
d a sampl
e
u
ser
f
or
the svndum
p
li
b
rary
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Junio C
H
amano
diff A
.
.
.
B: d
o
not
limit the sy
n
tax too narrowly
commit
|
commitdiff
|
tree
2010-07-15
Junio C H
a
mano
M
e
r
ge branc
h
'jn
/
paginate-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C H
a
m
a
no
M
e
rge branch 'wp/merge-tr
e
e-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
H
amano
Merge
b
r
anch '
j
s
/
merge-rr-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C Ha
m
ano
M
er
g
e
b
ranch 'jc/dif
f
-
m
erg
e
-b
a
se-multi'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Haman
o
Me
r
ge
b
ranch 'ns/merge
-
recursive-uptodate'
commit
|
commitdiff
|
tree
2010-07-15
J
u
n
i
o C Hamano
Me
r
ge branc
h
'jn/
t
est
s
'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
H
a
m
ano
M
e
rge
branch 'eb/doc-log-manp
a
ge'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
H
amano
Merge b
r
anch
'
jn/grep-open'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Hamano
Merge branch 'mg/re
v
ision-doc'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Hamano
Merge b
r
a
n
ch 'jk/maint-status-
k
eep-index-times
t
amp'
commit
|
commitdiff
|
tree
2010-07-15
J
unio
C
Hamano
Mer
g
e
br
a
nch '
j
c/rebase
-
i-commit-msg-fix'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o C
H
a
mano
Mer
g
e
branc
h
'ab/submodule-add-f'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C Hamano
Merge branch 'bc/mai
n
t-
m
a
kefi
l
e-fixes'
commit
|
commitdiff
|
tree
next