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 He
r
land
git no
t
es
m
erge: Manual conflict resolutio
n
, p
a
rt 2/2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
n
otes
m
erge:
Manual
confli
c
t resolution,
part
1
/2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
H
erl
a
nd
D
o
cumentat
i
on: Preliminary docs on 'git notes m
e
r
ge
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herlan
d
g
it no
t
es merge:
A
d
d aut
o
matic con
f
lict
r
esolvers
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
git
notes merg
e
: Handle real,
n
on-conflicting note
s
.
.
.
-
Junio C Hamano
: fixup minor style issues
Thanks-to:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
l
and
b
u
i
l
tin/note
s
.
c: Refac
t
or c
r
e
a
tion o
f
no
t
es commits
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
g
it notes merg
e
:
I
n
i
ti
a
l implementation handli
n
g tri
v
ia
l
.
.
.
-
Junio C Hamano
: fixup minor style issues
Thanks-to:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
r
land
bu
i
lt
i
n
/
no
t
e
s
.
c: S
p
li
t
notes ref
DWIMmery into a sep
a
r
a
te
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
c: Use
two new
l
ines (
i
nstead
of one) w
h
en concate
n
atin
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
(trivial
)
t3303: Indent
wi
t
h ta
b
s in
s
t
ead
o
f spa
c
es
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
J
oh
a
n Herla
n
d
n
otes
.
h/c: Propagate comb
i
ne
_
n
otes_fn return value
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
J
o
h
a
n Herland
notes
.
h/c: All
o
w combine_notes functions to rem
o
ve
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
o
t
e
s
.
c: Reorder functions in preparation for nex
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
J
o
h
a
n
H
erland
n
otes
.
h: Make
d
efault_notes_ref() available
i
n
n
otes API
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Johan H
e
rla
n
d
(tri
v
ial) notes
.
h: Minor documentat
i
on
fixes to copy_notes()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
a
n
Herland
n
o
tes
.
c: He
x
ify SHA1 in die() message from init_notes()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
René Scharfe
n
o
t
e
s: allow
--
d
ry-
r
un
for
-n
and --v
e
rbose for -v
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Mat
t
hie
u
M
o
y
Document -B<
n
>[/<m>], -M<n>
and -C<n> variants of
.
.
.
from the explanations of
Junio C Hamano
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Brad Ki
n
g
D
ocume
n
tatio
n
:
c
ite git-am from git-
a
pply
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
T
homas Rast
t7
0
03: fi
x
subdirectory-filter test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
J
o
nath
a
n Nieder
All
o
w "
c
he
c
k-ref-
f
ormat
--branch" from su
b
directory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nieder
ch
e
c
k
-
ref-format: handle su
b
comman
d
s in separate functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-05
M
atthieu Moy
p
r
e
t
ty-optio
n
s
.
txt: ma
t
ch
--form
a
t
's d
o
cumenta
t
ion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-03
Junio C Hamano
M
erge
br
a
nc
h
'sv/
m
aint-diff-q-
c
l
e
ar
-
fix'
into maint
commit
|
commitdiff
|
tree
2010-08-03
Junio C Hamano
Me
r
g
e
b
r
anch 'rr/svn-fe
'
i
n
to maint
commit
|
commitdiff
|
tree
2010-08-03
Junio
C Hamano
Merge
branch 'pt/git-gui'
i
nto maint
commit
|
commitdiff
|
tree
2010-08-03
R
am
k
umar Ramachandra
contrib/svn-fe: Add the
svn
-
fe target to
.
gitigno
r
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-03
R
amk
u
mar Ramac
h
andra
contrib/svn-fe: Fix
IncludeP
a
th
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-02
Juni
o
C
Hamano
Merge branch 'ab/tap' into mai
n
t
commit
|
commitdiff
|
tree
2010-08-02
Æva
r
Arnfjörð Bjarmason
t
e
st-lib:
R
emov
e
3 year ol
d
no-op
-
-no-python option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-02
Ævar Arnfjörð B
j
ar
m
ason
test-lib: Ignore --qui
e
t
under a TAP harne
s
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-02
J
u
nio C Hama
n
o
Merge
git://
r
epo
.
or
.
cz/git-gui into pt/git-gui
commit
|
commitdiff
|
tree
2010-08-02
Thomas Rast
Documentation/rev-parse: quotin
g
i
s required with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-02
J
unio
C
Ham
a
n
o
Docume
n
t
ation: report
i
ng
bugs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-02
Junio C H
a
m
a
no
Fix D
I
FF_QUEUE_CLEAR
r
ef
a
c
t
oring
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-28
David D
.
Kilzer
F
ix g
i
t r
e
base --c
o
ntinue to work w
i
th touc
h
ed files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-28
Matthieu
M
oy
Docu
m
e
n
t l
s
-files -t a
s
semi-obsolete
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Junio C
H
a
mano
Git 1
.
7
.
2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Junio
C
Ham
a
no
Sync
with 1
.
7
.
1
.
2
commit
|
commitdiff
|
tree
2010-07-27
Jun
i
o C
H
ama
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
amano
Sync wi
t
h 1
.
7
.
0 ser
i
es
commit
|
commitdiff
|
tree
2010-07-27
Ju
n
io C Haman
o
Git 1
.
7
.
0
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Jonathan Nieder
co
n
fi
g
-
-get -
-
path: check for
u
n
s
e
t
$
H
OME
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Stephen Boyd
c
o
mmi
t
:
r
emove
full stop
f
rom usage help for -u
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Matthieu Moy
Clarify
h
elp me
s
sage
w
h
e
n
no remote is specified in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Thomas Rast
Makefile: add c
h
eck-
d
ocs exce
p
tion for gitrevi
s
ions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Thomas Rast
F
ix
'
g
it' wrapper
u
sage s
t
rin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Thom
a
s Rast
Docum
e
n
t
a
t
ion/
g
it-push: Explain st
a
t
us output i
n
mor
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Tho
m
as Rast
Document receiv
e
.
denyDeleteCurrent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Thomas Rast
Cast
execl*() NUL
L
sent
i
nels
t
o (char *)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Nguyễn
T
hái Ng
ọ
c Duy
git-read-tree
.
txt: ackno
w
l
e
dg
e
the director
y
m
a
tching
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Jon Seymour
INSTALL
:
configure /etc/xml/catal
o
g
t
o bui
l
d docs
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Johannes Sixt
t3700-a
d
d: fix depende
n
c
e
on stdout and
s
tderr buffe
r
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Brando
n
Casey
git-re
b
as
e
--interactive
.
s
h: use printf inste
a
d o
f
echo
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
N
a
than W
.
Panike
Add a google-chrome option for web--br
o
wse
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Junio C
H
a
m
ano
Merge branch '
m
aint-1
.
7
.
1' into ma
i
n
t
commit
|
commitdiff
|
tree
2010-07-26
Ju
n
io C Ha
m
ano
M
e
r
g
e b
r
a
nch 'maint
-
1
.
7
.
0' into mai
n
t-1
.
7
.
1
commit
|
commitdiff
|
tree
2010-07-26
J
unio
C Hama
n
o
Merge branch 'maint-1
.
6
.
6
'
into maint-1
.
7
.
0
commit
|
commitdiff
|
tree
2010-07-26
Junio
C Hamano
Merge branch 'mai
n
t-1
.
6
.
5' into mai
n
t-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-07-26
Stephen
Boyd
r
e
qu
e
st-pull
.
t
xt: Document -p option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Jun
i
o C Hamano
Merge branc
h
'ma
i
nt-1
.
6
.
4' into mai
n
t-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-07-25
Greg Brockman
Check size of path buffe
r
before wri
t
ing into
i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Junio C Hamano
Git 1
.
7
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
J
unio C
H
amano
t
e
sts: corr
e
ct "does r
e
flo
g
e
xist?" t
e
st
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Brandon Casey
t/: work a
r
ound o
n
e-shot v
a
riable assignm
e
nt with test_m
u
s
t_fa
i
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Jonathan N
i
eder
t/README: cor
r
ect an exception whe
n
breaking a && c
h
ain
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Brandon Case
y
t/{t5541,lib-httpd}: replace
p
r
o
ble
m
at
i
c '!
(
)'
n
otati
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Brando
n
Casey
t
/t3700
:
c
o
nvert two u
s
es of n
e
gat
i
on operat
o
r '!'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Junio
C Hamano
Merge branch 'ma
i
n
t'
commit
|
commitdiff
|
tree
2010-07-20
B
r
andon
C
asey
t
/
R
EADME: clarify test
_
must_f
a
il d
e
scri
p
t
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Greg
Brockman
Check size o
f
path buffer before
writing
i
nto
i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Junio
C
H
a
mano
Me
r
ge branch
'
maint'
commit
|
commitdiff
|
tree
2010-07-19
Ralf Thielow
update-server-i
n
fo: Shorten read_pack_info_
f
ile()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfjörð B
j
armason
git add:
Add --ignor
e
-mi
s
s
i
ng to S
Y
NOP
S
I
S
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfj
ö
r
ð
Bjarmason
git s
u
bmodule add: Remove old
d
ocs about implicit -f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Jens
L
e
hmann
gi
t
s
u
b
modu
l
e
a
dd: Require th
e
new --force option
t
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Junio C Hamano
Merge branch '
j
l/add-n-ignore-missing'
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
Docu
m
entation: Expl
a
in git-mergetool's
u
s
e
of tempo
r
ary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Ju
n
i
o
C Hamano
Merg
e
branch 'jc/diff-merge-
b
ase-multi'
commit
|
commitdiff
|
tree
2010-07-16
Thomas Rast
O
n
ly run aggregate-results ove
r
actual counts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Jon
a
than Nieder
Add a sam
p
le user for
t
h
e
svndump l
i
brar
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Junio C Hamano
diff A
.
.
.
B: do n
o
t limit the syntax too narrowly
commit
|
commitdiff
|
tree
2010-07-15
Junio C H
a
mano
Mer
g
e branch
'jn/
p
aginat
e
-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hama
n
o
M
erge bran
c
h
'wp/merge-tree-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hama
n
o
Merge branch 'js/merge-rr-fix'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C Ha
m
ano
Merge branch
'jc/di
f
f
-
merge-b
a
s
e-multi'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hama
n
o
Merge branch '
n
s/merge-rec
u
r
s
ive-uptod
a
te'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io C
H
amano
Merge br
a
nch 'j
n
/t
e
s
t
s'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Me
r
ge branch
'eb/do
c
-lo
g
-manpage
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge branch
'
jn/grep
-
open'
commit
|
commitdiff
|
tree
2010-07-15
J
u
n
io C Hamano
Mer
g
e branc
h
'mg/revision-doc'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C Hamano
Mer
g
e
b
ranch '
j
k/main
t
-status-keep-index-timest
a
mp
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
M
erge bran
c
h 'jc
/
rebase-i-
c
ommit
-
msg-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C Hama
n
o
M
e
rge b
r
a
nch 'ab/
s
ubm
o
du
l
e-add-f'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
H
amano
Merge br
a
n
ch 'bc
/
maint-make
f
i
l
e
-fixes'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io
C
Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2010-07-15
Jona
t
han Nieder
Documentation: add
submodule
.
*
t
o the b
i
g con
f
iguration
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-15
Jonath
a
n Nieder
gitmod
u
les
.
5: url can be a relative pa
t
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-15
Pavan Kumar S
u
nkara
gitweb: fix
e
sc_url
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Jon
a
than
Nieder
g
i
t
-
-
pagi
n
ate:
paginate external com
m
and
s
a
gain
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next