repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git notes merge: Add automatic conflict resolvers (ours, theirs, union)
2010-11-17
Jo
h
an Herlan
d
git
n
ot
e
s me
r
g
e: Ad
d
automatic
c
onfl
i
ct res
o
l
v
ers
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Handl
e
r
eal,
non
-
c
onflicting not
e
s
.
.
.
Thanks-to: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an
H
e
rland
buil
t
i
n/note
s
.
c: Re
f
ac
t
o
r
creation of notes commi
t
s
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
it not
e
s me
r
ge: Initial imp
l
ementatio
n
ha
n
dling
t
rivial
.
.
.
Thanks-to: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
bui
l
tin
/
notes
.
c
:
Split notes ref DWIMmery in
t
o a s
e
parate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
n
o
tes
.
c: Use two newlines
(
inste
a
d of one) when co
n
cate
n
atin
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
(trivial) t3303: I
n
dent with tabs instead of spaces
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
h/
c
: Propagate
c
ombine_note
s
_fn r
e
tur
n
val
u
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Johan H
e
rl
a
nd
notes
.
h/c:
Allow combine_notes functions to remove
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
J
o
h
an He
r
land
not
e
s
.
c
: Reorder functions in prepara
t
i
o
n for next
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
no
t
es
.
h
:
Make defa
u
lt_notes_ref() available in n
o
tes API
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan Herl
a
nd
(
trivial)
n
o
tes
.
h:
M
inor d
o
cume
n
tation
fixes to copy
_
n
o
tes
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
J
o
h
an
H
e
r
l
and
notes
.
c:
H
e
x
ify S
H
A1 in die() me
s
s
a
ge from ini
t
_notes()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
René Scharf
e
n
o
t
es: a
l
low -
-
dry
-
r
un for -
n
and --verbose for -v
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Matthi
e
u Moy
Document -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
B
r
ad Kin
g
Documentati
o
n:
cite g
i
t-am
fr
o
m git-apply
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Thomas Ra
s
t
t7003: fix su
b
dir
e
ct
o
ry-filter
t
est
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jon
a
than Nieder
A
l
low
"check-ref-format --
b
r
a
n
c
h" fro
m
subdir
e
ctory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nie
d
er
check-
r
ef-format: hand
l
e
subcomm
a
nds in
sepa
r
a
t
e
functions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-05
Matthieu Moy
pretty-options
.
txt:
match
-
-
f
or
m
at's docu
m
entat
i
on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-03
Junio C Hamano
Mer
g
e
branch 'sv/ma
i
nt-diff-
q
-
cl
e
ar-fix' into maint
commit
|
commitdiff
|
tree
2010-08-03
J
u
nio C Hama
n
o
Merge bra
n
ch 'rr/svn-f
e
'
into ma
i
nt
commit
|
commitdiff
|
tree
2010-08-03
Jun
i
o
C
Hamano
M
e
rge branch 'pt/git-
g
ui' into mai
n
t
commit
|
commitdiff
|
tree
2010-08-03
Ramk
u
mar
R
amachan
d
r
a
contrib/svn-fe: Ad
d
the svn-fe t
a
rg
e
t to
.
gitignore
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-03
R
amkumar
R
amachandra
co
n
tr
i
b/svn
-
fe: Fi
x
IncludeP
a
th
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Junio
C
Haman
o
Merge bra
n
ch 'ab/ta
p
'
i
nt
o
m
aint
commit
|
commitdiff
|
tree
2010-08-02
Ævar Arnfjörð Bjarma
s
on
test-lib: Re
m
ove
3 year old n
o
-op
--no-python opti
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Æv
a
r Arnfj
ö
rð Bjarmason
tes
t
-lib: Ignore --q
u
ie
t
under
a
TAP harness
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Ju
n
io C Hama
n
o
Merg
e
git://repo
.
o
r
.
c
z/git-gu
i
into pt/git-gui
commit
|
commitdiff
|
tree
2010-08-02
T
h
o
m
a
s
Rast
Documentation/rev
-
pa
r
se: quo
t
i
n
g is required with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Jun
i
o C Hamano
Do
c
umentation:
r
eporting bugs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Junio C Hama
n
o
Fix DIFF_Q
U
EUE
_
CLEA
R
ref
a
ctoring
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-28
Davi
d
D
.
Kilze
r
Fix git rebase
-
-cont
i
nue
to work wit
h
touched fi
l
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-28
M
atthieu Moy
Document
l
s-fil
e
s -t as s
e
mi-obsolete
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Junio C Hama
n
o
Gi
t
1
.
7
.
2
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Junio C Hamano
S
ync with 1
.
7
.
1
.
2
commit
|
commitdiff
|
tree
2010-07-27
J
uni
o
C Hamano
Git 1
.
7
.
1
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Junio C Hamano
S
y
nc with
1
.
7
.
0
series
commit
|
commitdiff
|
tree
2010-07-27
Junio C Hamano
Gi
t
1
.
7
.
0
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Jonatha
n
Nieder
c
o
nfig
-
-ge
t
--path: check for un
s
et $HOME
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Stephe
n
B
oyd
co
m
mit: remove full s
t
op fro
m
u
s
age help
for -u
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Mat
t
hieu Mo
y
Clarify help message when no re
m
o
t
e
is sp
e
cified in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
T
h
om
a
s Rast
Makefile: add chec
k
-docs exception for gi
t
r
e
visions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Thomas
Rast
Fix 'git'
w
rapper usage st
r
ing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
T
homas
Rast
Do
c
ument
a
tion/gi
t
-push:
E
xplain status output in more
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Thomas Rast
Docume
n
t receive
.
denyDeleteCurrent
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Thomas Rast
Cas
t
ex
e
cl*()
N
ULL sentinels to
(
char *)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
N
g
uy
ễ
n
Thái Ngọc Duy
git
-
read-tree
.
txt: a
c
k
n
owledge
th
e
direct
o
ry mat
c
h
ing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Jo
n
Seymour
IN
S
T
A
LL: configu
r
e /etc/xml/c
a
talog
t
o build d
o
cs on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
J
o
h
a
nnes Sixt
t3700-ad
d
:
fix dependence on stdout and stder
r
buf
f
er
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Brandon Casey
git-re
b
as
e
--in
t
eractive
.
s
h: use prin
t
f instead
o
f echo
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Na
t
han W
.
Pani
k
e
Add a google-chrome
o
ption for
w
eb--browse
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Junio C
H
a
m
ano
Merge branch 'main
t
-1
.
7
.
1' into maint
commit
|
commitdiff
|
tree
2010-07-26
Junio C Hamano
Me
r
ge branch 'm
a
i
nt-1
.
7
.
0' int
o
maint-1
.
7
.
1
commit
|
commitdiff
|
tree
2010-07-26
Junio C H
a
ma
n
o
M
erge bra
n
c
h
'main
t
-1
.
6
.
6' into maint-1
.
7
.
0
commit
|
commitdiff
|
tree
2010-07-26
Junio
C
Hamano
Merg
e
bra
n
ch 'maint-1
.
6
.
5' into main
t
-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-07-26
S
t
ephen
B
oyd
re
q
ue
s
t-pull
.
txt: Doc
u
ment -p
optio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Junio
C Ha
m
ano
Mer
g
e b
r
anch 'ma
i
nt-1
.
6
.
4
'
into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-07-25
Greg Broc
k
man
Check siz
e
of path buff
e
r b
e
fore writing into it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Juni
o
C Hamano
Gi
t
1
.
7
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
J
u
nio C Hama
n
o
t
e
s
t
s: correct "does
re
f
log
ex
i
st?" tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Brand
o
n Casey
t/: work ar
o
un
d
o
n
e-sh
o
t vari
a
b
le as
s
ignment with test_must_fail
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Jonathan Nieder
t/README: correct an exception when breaking a && chain
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Brandon Casey
t/{t5541,lib-httpd}: rep
l
ac
e
prob
l
ematic '!()' notation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Brandon Ca
s
e
y
t/t3700: co
n
vert tw
o
u
ses of negation operator '!'
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Junio C H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-20
Brandon Casey
t/RE
A
D
M
E: clarify test
_
must_fail des
c
ription
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Greg Brockman
C
h
eck
size of path bu
f
fer before writing into it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Junio C Haman
o
M
e
rge bran
c
h 'm
a
i
n
t
'
commit
|
commitdiff
|
tree
2010-07-19
Ralf Thielow
update-server-in
f
o:
S
horten read_pack_
i
nf
o
_
f
ile()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ævar A
r
n
f
jörð Bja
r
mason
gi
t
add: Add --
i
g
n
or
e
-missing to SYNOPSI
S
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfjörð Bjarmaso
n
git submodule add
:
R
emo
v
e o
l
d
docs about implicit -f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
J
e
ns Lehmann
git submodule add
:
Req
u
ire the new --force option t
o
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Junio C
H
aman
o
Merge bra
n
ch 'jl/
a
dd-n-ignore-missing'
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
Doc
u
mentation: Explain git-mergetool's use of temporary
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Ju
n
io C Hamano
Merge
b
ranc
h
'j
c
/
d
iff-merge-base-
m
u
l
ti'
commit
|
commitdiff
|
tree
2010-07-16
T
homas Rast
Only run aggregate-resu
l
ts over actual
counts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Jonathan
Nieder
Add
a
sample user
f
o
r the svndu
m
p lib
r
ary
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Junio C Hamano
diff A
.
.
.
B: do not limit the syn
t
a
x to
o
narrowl
y
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o C
H
amano
Merge branch 'jn/paginate-fix'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io
C Hamano
Merge br
a
nch
'
wp/merge-tree-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ha
m
ano
Merge br
a
nch '
j
s/m
e
rge
-
rr
-
fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge
branch 'jc/diff-merge-bas
e
-mult
i
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge branch
'
n
s/me
r
ge-re
c
ursive-u
p
todate
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ha
m
ano
M
e
r
ge branch 'j
n
/tests'
commit
|
commitdiff
|
tree
2010-07-15
Junio C H
a
mano
Merge branch 'eb/doc-
l
og-manpage
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ha
m
ano
M
e
rge b
r
anch '
j
n/grep-o
p
en'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge bran
c
h 'mg/r
e
vision-doc'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge
b
ranch 'jk
/
maint-statu
s
-kee
p
-index-timesta
m
p'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io C
H
a
m
a
no
Mer
g
e branch 'jc/re
b
ase
-
i-comm
i
t-msg-f
i
x'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C Haman
o
Merge b
r
a
n
ch
'ab/submo
d
ule-add-f'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o C Hama
n
o
Mer
g
e
bra
n
c
h 'bc/maint-mak
e
file-fixes'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hama
n
o
Merge
b
ranch 'mai
n
t
'
commit
|
commitdiff
|
tree
2010-07-15
J
onat
h
a
n Nieder
Documenta
t
ion: ad
d
submodu
l
e
.
*
t
o the
b
ig configuration
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nieder
gitmodul
e
s
.
5: url can be
a
rela
t
i
v
e path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
Pavan Kumar Sun
k
ara
gitweb: fix esc_u
r
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
J
o
n
a
t
h
a
n
N
ieder
g
i
t --paginat
e
:
paginate exte
r
nal c
o
mmands again
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jay
S
offian
MER
G
E
_RR is in
.
git,
not
.
gi
t
/rr-cac
h
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Will Palmer
merge-tr
e
e
:
fix where two branch
e
s share no changes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Will Palmer
add
b
asic
tests
f
or merge
-
tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next