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
git notes merge: Manual conflict resolution, part 2/2
2010-11-17
Johan Herland
git note
s
merge:
Manual c
o
nfl
i
ct resolution,
p
a
r
t 2/2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
g
it
notes merge
:
Manual conflict r
e
solu
t
ion,
part 1/2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Docume
n
tation
:
Pre
l
iminary docs on 'gi
t
not
e
s merge'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git no
t
e
s merge: Add automat
i
c conflict resolvers
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
gi
t
no
t
es m
e
rge: Ha
n
dl
e
real, non-co
n
f
l
icting notes
.
.
.
Thanks-to: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
bu
i
ltin/notes
.
c
: Refact
o
r
creation of n
o
tes commits
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an
H
erland
g
i
t
notes me
r
ge: In
i
ti
a
l im
p
le
m
entation ha
n
dling trivial
.
.
.
Thanks-to: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
built
i
n/notes
.
c: Split not
e
s ref DWIMmery
i
n
to a se
p
ara
t
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
n
ot
e
s
.
c: Use tw
o
n
e
wlines (inste
a
d of one
)
when concatenat
i
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
(
t
r
i
vial) t3303
:
Indent with
t
abs in
s
tead o
f
spaces
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
h
/
c: Propagate
combin
e
_notes_fn return val
u
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herlan
d
notes
.
h/c: Allow
combine_notes function
s
to remove
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
ote
s
.
c: Reorder functions in
p
r
e
paration for nex
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
H
erla
n
d
notes
.
h:
M
ake de
f
ault_notes_ref() a
v
ailable in n
o
tes API
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herland
(trivial)
n
o
tes
.
h:
M
i
nor document
a
tion fixes to
c
opy_note
s
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Johan He
r
l
a
nd
notes
.
c: Hexify SHA1 in die
(
) me
s
sage
f
rom init_notes()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
R
e
né
Scharfe
notes: allow --dry-run f
o
r
-n and --verbose for
-
v
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Matth
i
e
u Moy
D
o
cum
e
nt -B<n>[
/
<m>], -M<
n
>
and -C<n> variants
of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Brad King
D
oc
u
ment
a
tion: cite git-am fro
m
git-apply
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Thom
a
s Ras
t
t7003: fi
x
subdirectory-fi
l
ter test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jona
t
han
N
ieder
Allow
"check-r
e
f-format --branch"
f
r
o
m
s
u
b
d
i
rectory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan
N
ieder
check-
r
ef-for
m
at: handl
e
s
ubcomman
d
s
i
n separate
functions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-05
Mat
t
h
i
eu Moy
pretty-op
t
ions
.
txt
:
match
--format's
documentation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-03
Junio C Hamano
Merge branch 'sv/maint-diff-q-cle
a
r-fix'
into maint
commit
|
commitdiff
|
tree
2010-08-03
J
unio C Hamano
Merge
branc
h
'rr/sv
n
-fe'
i
nt
o
maint
commit
|
commitdiff
|
tree
2010-08-03
Jun
i
o C Hama
n
o
Merg
e
branch 'pt
/
g
i
t-gui'
into m
a
in
t
commit
|
commitdiff
|
tree
2010-08-03
R
a
mkumar Ramacha
n
dr
a
contrib/svn-fe
:
Add t
h
e svn-fe targe
t
to
.
gitignore
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-03
Ramkumar
Ramachandra
contrib/s
v
n-fe: Fix IncludePa
t
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Jun
i
o
C Hamano
M
erge branch 'ab
/
tap' into mai
n
t
commit
|
commitdiff
|
tree
2010-08-02
Ævar Arnfjörð Bjarmaso
n
test-lib: Remove 3 year old
n
o-op --no-python option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Ævar Arnfjörð Bjarmason
test-
l
ib
:
Ignore
-
-quie
t
under a TAP
h
arness
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Junio C Hamano
Merge g
i
t://rep
o
.
or
.
c
z
/git-gu
i
int
o
pt/git-gui
commit
|
commitdiff
|
tree
2010-08-02
Thomas Rast
Docu
m
entation/rev-parse: quoting
i
s r
e
quired with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Junio
C H
a
mano
Docu
m
entat
i
on: report
i
ng
bugs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
J
unio C
H
amano
F
i
x DIFF_QUEUE
_
CLEA
R
refactoring
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-28
David D
.
Kilze
r
F
i
x
g
it r
e
base --contin
u
e to work wit
h
touch
e
d
files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-28
M
atthieu Moy
D
oc
u
m
e
nt ls-files -t as semi-obsole
t
e
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Junio C Hamano
G
it 1
.
7
.
2
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Junio
C
Hama
n
o
Sync with
1
.
7
.
1
.
2
commit
|
commitdiff
|
tree
2010-07-27
Junio C Haman
o
Git 1
.
7
.
1
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Junio C Hamano
Sync with
1
.
7
.
0 series
commit
|
commitdiff
|
tree
2010-07-27
Ju
n
io
C
Hamano
Git 1
.
7
.
0
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Jonathan Nieder
config --
g
et --path: ch
e
c
k
for un
s
et $HOME
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Step
h
en Boyd
commit: rem
o
ve full s
t
o
p
from usage
help for -u
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Matthieu
M
oy
Cl
a
rify h
e
lp message when no remote
i
s specified
i
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Tho
m
as R
a
st
Makefile: add check-docs exc
e
pti
o
n for gitrevisi
o
ns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Thomas Ras
t
Fix 'git' wrappe
r
usage s
t
ring
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Thomas Rast
Document
a
tion/
g
it-pu
s
h: Explai
n
s
t
atu
s
ou
t
p
u
t
in
m
o
r
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Tho
m
as Rast
Document r
e
ceive
.
denyDel
e
t
eCurrent
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Thomas Rast
Cast exec
l
*() NULL s
e
ntinels to (char *)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Nguyễn Thái Ngọ
c
Duy
git-read-tr
e
e
.
txt: acknowledge th
e
direc
t
o
r
y matching
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Jo
n
Seymour
I
NSTALL: con
f
igu
r
e /etc
/
xml/catalo
g
to build docs on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
J
o
h
annes Sixt
t
3
7
0
0-add:
fix d
e
pendence on stdout and stderr
b
uffering
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Brandon Cas
e
y
git-rebase--interact
i
ve
.
sh: use print
f
i
n
stead of echo
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Nathan W
.
Panike
Add a g
o
ogle-chrome option for web--browse
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Junio C Ha
m
a
n
o
Merge bran
c
h 'main
t
-1
.
7
.
1' i
n
to
maint
commit
|
commitdiff
|
tree
2010-07-26
J
u
n
io C
H
amano
Merge branch
'm
a
int-1
.
7
.
0
'
in
t
o maint-1
.
7
.
1
commit
|
commitdiff
|
tree
2010-07-26
Junio C
H
amano
M
e
rge bran
c
h
'
maint-1
.
6
.
6' into
m
a
i
nt-1
.
7
.
0
commit
|
commitdiff
|
tree
2010-07-26
Jun
i
o C Ham
a
no
Merge b
r
anch 'maint-1
.
6
.
5' into
maint
-
1
.
6
.
6
commit
|
commitdiff
|
tree
2010-07-26
Stephen Boyd
request-pull
.
txt: Do
c
ument -
p
o
ption
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
J
u
n
i
o C Hamano
M
e
rge branch 'maint-1
.
6
.
4'
int
o
maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-07-25
Greg
Brockman
Check size of p
a
th
buffer before writing i
n
to
i
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
J
u
nio C Hamano
Git 1
.
7
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
J
u
n
i
o C Ham
a
no
tests:
correct "does reflog
e
xist?" tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Brand
o
n
Ca
s
ey
t/:
work around one-shot
variable a
s
signment with
t
est_mus
t
_f
a
il
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Jonathan
N
ieder
t/README:
c
orrec
t
an e
x
c
e
ption
when breaking a &
&
chain
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
B
r
andon Casey
t/
{
t
5
541,lib
-
httpd}: replace problem
a
t
i
c '!()'
n
otation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Brand
o
n Casey
t
/
t3700
:
c
o
nvert
t
wo u
s
es
o
f negation operator '!'
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Junio C Hamano
Merge branch '
m
a
int'
commit
|
commitdiff
|
tree
2010-07-20
Brand
o
n C
a
sey
t/README: cl
a
ri
f
y test_must_fail d
e
scriptio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Greg Bro
c
kman
Check size of path buffe
r
be
f
ore writing
into it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Juni
o
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-19
Ralf
Thie
l
ow
u
pdate-server-i
n
fo:
S
hor
t
en read_pack_info_file()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ævar
Arnf
j
örð
B
j
ar
m
as
o
n
git add
:
A
dd --
i
g
n
ore-missing to SYNO
P
SIS
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Æva
r
Arnfjörð Bjarmason
git
submodu
l
e
add: Remove old docs about implic
i
t -f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Je
n
s
L
ehm
a
n
n
git submodu
l
e add
:
Require the n
e
w
--for
c
e option t
o
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Juni
o
C
Ha
m
a
no
M
e
r
ge branch 'jl/add-n-ignor
e
-missing
'
commit
|
commitdiff
|
tree
2010-07-19
David Ag
u
ilar
Docum
e
n
t
a
t
ion
:
Explain g
i
t
-
mergetool
'
s use of te
m
porary
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
J
u
nio C Ham
a
no
Merge branc
h
'j
c
/di
f
f-merge-
b
ase-mul
t
i'
commit
|
commitdiff
|
tree
2010-07-16
T
h
omas
R
a
st
Only
r
un aggregate-res
u
lts over actual counts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Jona
t
han Ni
e
der
Add a sample user
for
t
he svndump libra
r
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Junio
C
Haman
o
diff A
.
.
.
B: do
n
ot
limi
t
the syntax
t
oo
narrowly
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C Hamano
Merge b
r
anch 'jn/pagi
n
at
e
-fix'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C Hamano
Merge
b
ranc
h
'wp/merge
-
tree-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Hamano
Merge b
r
a
n
ch 'j
s
/
m
er
g
e-r
r
-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ham
a
n
o
Merge branch 'jc
/
d
iff
-
merge-
b
a
s
e-multi'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o C Hama
n
o
Merge br
a
nch 'ns/merge-recursive-uptodate'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Haman
o
Merge br
a
nch 'jn/te
s
t
s'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge br
a
nch 'eb/doc-log
-
manpag
e
'
commit
|
commitdiff
|
tree
2010-07-15
J
u
n
io C Hamano
Me
r
ge
br
a
nch 'jn/gr
e
p-open'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o
C
Ham
a
no
Mer
g
e
b
r
anch
'
mg/r
e
vision-doc'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
H
a
mano
Mer
g
e branch
'jk/maint-stat
u
s-k
e
e
p
-index-ti
m
estam
p
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ham
a
no
Mer
g
e branch 'jc/rebase-i-com
m
it-m
s
g-fi
x
'
commit
|
commitdiff
|
tree
2010-07-15
J
u
ni
o
C Hamano
Me
r
ge branch 'ab/
s
ubmodul
e
-add-f
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
M
erge br
a
nch 'bc/maint
-
makefile-fixes
'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Hamano
Merge
branch
'maint'
commit
|
commitdiff
|
tree
2010-07-15
J
o
nath
a
n Nieder
Docume
n
tation:
add su
b
modu
l
e
.
* t
o
t
he big confi
g
uratio
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
J
onathan Nieder
gitmodule
s
.
5: url can be a relative path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
P
avan Kumar Sunkara
gitweb: fix esc_url
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jonat
h
an Nieder
g
i
t --
p
agi
n
ate: paginate e
x
t
ernal comma
n
ds a
g
a
i
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next