repo.or.cz
/
git
/
mingw.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 1/2
2010-11-17
Johan Her
l
a
nd
git not
e
s merge: Manual
c
onfli
c
t r
e
solution, part 1/2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
Docu
m
entation: Preliminary do
c
s
o
n
'git notes
merge'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git no
t
es merge
:
Add automa
t
ic conflict re
s
o
l
vers
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herlan
d
git
n
otes me
r
g
e
: Handle real,
non-conflicting note
s
.
.
.
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
builtin/notes
.
c
:
R
e
factor creat
i
on of notes co
m
mits
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herla
n
d
gi
t
no
t
e
s
m
e
rge: Initial imp
l
ementa
t
ion handling trivial
.
.
.
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 Herland
buil
t
in/notes
.
c: Spli
t
note
s
re
f
D
WIMm
e
ry into a s
e
p
a
rat
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
notes
.
c: Use
two newli
n
e
s
(inste
a
d
o
f one)
when conca
t
ena
t
i
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
J
oh
a
n Herl
a
n
d
(trivial) t33
0
3:
Indent with tabs instead of spac
e
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han He
r
l
a
nd
notes
.
h/c: Propagate combine_notes_fn return valu
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Johan
He
r
la
n
d
notes
.
h/c:
A
l
low combin
e
_not
e
s functions t
o
r
e
move
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Her
l
and
n
o
tes
.
c
: R
e
order
f
unct
i
ons in p
r
e
par
a
tion for next
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Johan
Her
l
and
notes
.
h: Make def
a
ult_not
e
s
_
ref() avai
l
a
b
le in notes AP
I
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herla
n
d
(trivial) notes
.
h: Min
o
r doc
u
ment
a
tion fi
x
es to copy_notes()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n Her
l
and
n
o
tes
.
c: Hexify
SHA1
in die() message from init_no
t
es()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
René Sc
h
arfe
notes: allow --dr
y
-run
f
o
r
-
n and
-
-verbo
s
e f
o
r
-v
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Mat
t
hi
e
u Mo
y
Document -B<n>[
/
<
m>],
-
M
<n> and -
C
<
n
> variants o
f
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Br
a
d King
Docume
n
tation
:
cite git-am from
g
i
t
-apply
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
T
homas
R
as
t
t
7
0
0
3: fix subd
i
r
ect
o
ry-f
i
lter
t
es
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jona
t
han Nieder
A
l
low "
c
hec
k
-ref-form
a
t --branch" from sub
d
i
r
ectory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan N
i
e
de
r
c
h
e
c
k-ref-format:
hand
l
e subc
o
mmands in separa
t
e functions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-05
Matthieu Moy
p
r
e
t
t
y-options
.
txt: mat
c
h --for
m
a
t
's docume
n
t
a
tion
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-03
Junio C Hamano
Merge branch 'sv/maint
-
diff-q-clea
r
-fix' into m
a
int
commit
|
commitdiff
|
tree
2010-08-03
Juni
o
C
Haman
o
Merge bra
n
ch 'rr/svn-fe'
i
nto m
a
int
commit
|
commitdiff
|
tree
2010-08-03
Junio
C Hamano
Merge
b
r
a
nch
'
pt/git-
g
ui' into mai
n
t
commit
|
commitdiff
|
tree
2010-08-03
R
a
mkumar
Ramachandra
contrib/svn-fe
:
Add the svn-fe
t
arget to
.
gitignore
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-03
Ramkumar Ram
a
cha
n
dra
contrib/svn-fe: Fi
x
IncludePath
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Junio C Hamano
Merge branch
'ab/tap' into
m
a
int
commit
|
commitdiff
|
tree
2010-08-02
Ævar
Arnfjörð Bja
r
mason
test-lib: Rem
o
ve 3
ye
a
r old
no-op --no
-
pytho
n
option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Ævar Arnfjö
r
ð
B
jarm
a
son
test-lib:
I
gno
r
e
-
-qu
i
et under a
TAP har
n
ess
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Jun
i
o
C
H
amano
Merge git
:
/
/repo
.
or
.
cz/g
i
t-gui into pt/git
-
gui
commit
|
commitdiff
|
tree
2010-08-02
Thomas
Ra
s
t
Documenta
t
ion/rev-pars
e
:
quoting is r
e
quired with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Junio C Hamano
Documentat
i
on
:
reporting
b
ugs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Jun
i
o C
H
a
mano
Fix DI
F
F_QUE
U
E
_CLEAR refactoring
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-28
David D
.
Kilzer
Fix gi
t
rebase -
-
continue to work with t
o
uched files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-28
Matthieu Moy
Documen
t
l
s-files -
t
as semi-obsolete
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Junio C Haman
o
Git 1
.
7
.
2
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Junio C Hamano
Sync with 1
.
7
.
1
.
2
commit
|
commitdiff
|
tree
2010-07-27
Ju
n
io C Hamano
Git
1
.
7
.
1
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
J
unio
C Hama
n
o
Sync with 1
.
7
.
0
series
commit
|
commitdiff
|
tree
2010-07-27
J
u
nio C Hamano
Git 1
.
7
.
0
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Jonathan Nieder
conf
i
g --get -
-
pa
t
h
: check
f
or unse
t
$HOME
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Stephe
n
Boyd
commit: remo
v
e full stop
f
rom usag
e
h
elp for
-
u
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Matthi
e
u
Moy
Clarify help message when no re
m
o
t
e is
s
pecified in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
T
homas Rast
Makefile:
add chec
k
-docs e
x
ception for gitrevisions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Thomas
Rast
Fi
x
'git'
w
rapper us
a
ge string
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Th
o
mas R
a
st
D
o
cum
e
n
t
a
t
ion/
g
i
t-push: Explai
n
status output
i
n more
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Thoma
s
Rast
Do
c
ument recei
v
e
.
denyDeleteC
u
rrent
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Thomas Rast
Cast
e
xecl*() NU
L
L sentinels to (ch
a
r *)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Ngu
y
ễn Thái Ngọc Duy
g
i
t-read-tree
.
txt: a
c
k
n
owledge the directory matching
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
J
o
n Seymour
INS
T
A
LL: configu
r
e
/etc/xml/cata
l
o
g
to bui
l
d docs o
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
J
ohannes Sixt
t3
7
00-add: fix dependence on stdout and stderr bu
f
fering
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Brandon C
a
sey
git-rebase--
i
nt
e
racti
v
e
.
sh: use printf instead 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 optio
n
for web--
b
rows
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Ju
n
io
C
Hamano
Merge branch 'maint-1
.
7
.
1' into
m
ai
n
t
commit
|
commitdiff
|
tree
2010-07-26
Junio
C
H
amano
Merge branch 'm
a
int-1
.
7
.
0' into
maint-1
.
7
.
1
commit
|
commitdiff
|
tree
2010-07-26
Jun
i
o C
H
amano
M
e
rge branch 'maint
-
1
.
6
.
6' into maint-1
.
7
.
0
commit
|
commitdiff
|
tree
2010-07-26
Junio C Hamano
Merg
e
b
r
anch 'maint-1
.
6
.
5' into maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-07-26
Stephen Boyd
r
e
qu
e
st-pull
.
txt:
Document
-p
o
ption
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
J
u
nio
C
Ha
m
ano
Me
r
g
e branch 'maint-1
.
6
.
4' into
m
ain
t
-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-07-25
Greg Br
o
ckman
Check size of path buffer
b
e
fore writi
n
g into it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Junio C H
a
mano
Git 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
tests: correct "do
e
s reflog exis
t
?"
tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Brandon
C
asey
t
/: work around
o
ne-shot va
r
iable assignment with t
e
st_must_
f
ail
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Jona
t
han Niede
r
t/README: c
o
rrect an excepti
o
n when breaking a
&&
c
h
a
in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Brand
o
n
C
as
e
y
t/{t5541,lib-
h
ttp
d
}
:
replace
p
ro
b
lema
t
ic '!()' notation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Brandon Casey
t/t3700:
c
onv
e
rt two use
s
of negation
operator '!
'
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Junio C Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-07-20
Bra
n
don Casey
t/READ
M
E
:
clarify te
s
t_must_fail
d
e
scrip
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Gre
g
Brockman
Check size of path buffer befo
r
e wr
i
ting
i
nt
o
it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Junio C Hama
n
o
Merge b
r
a
nch 'maint'
commit
|
commitdiff
|
tree
2010-07-19
Ralf Thie
l
ow
update-server-info: Shorten read_
p
ac
k
_info_
f
ile()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Ar
n
fjörð Bjarmason
git add:
A
dd --ignore
-
mis
s
ing
t
o S
Y
NOPSI
S
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Æ
var Arnfjörð Bjarm
a
son
git
s
ub
m
odule
a
dd:
Remove old d
o
cs about impl
i
cit -
f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Jen
s
Lehmann
gi
t
submodule
a
d
d: Require the new --force option t
o
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Jun
i
o C Hama
n
o
Merge branch 'jl/add-n-ignore-m
i
ssin
g
'
commit
|
commitdiff
|
tree
2010-07-19
Davi
d
Aguilar
Doc
u
mentation:
Explain g
i
t
-mergetoo
l
's use of t
e
mporary
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Junio C Hamano
Merge
b
ranch 'j
c
/diff-merge
-
base-multi'
commit
|
commitdiff
|
tree
2010-07-16
Thomas Rast
Onl
y
run aggre
g
at
e
-results ov
e
r
a
c
t
u
al count
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Jonathan Ni
e
der
Add a sample user for the svndump l
i
brary
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Junio C Hamano
diff
A
.
.
.
B: do not
limi
t
the
s
yntax
too narrowly
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge
branch '
j
n/paginate
-
fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merg
e
branch 'wp/merge-tree-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hama
n
o
Merge branch '
j
s
/
m
erge-
r
r-fi
x
'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C
H
amano
Merge branch 'jc/di
f
f
-
merge-base-multi
'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
i
o
C Hamano
M
erge branch 'ns/merg
e
-recursi
v
e-upto
d
ate'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge branch
'
jn/tests
'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C Hamano
M
erge
bra
n
ch '
e
b/doc-log-m
a
npage'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge
b
ranch '
j
n/gr
e
p-open'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o
C
Hamano
Merge branch
'
mg/revision-
d
oc'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ha
m
ano
Merge branch 'j
k
/maint-status
-
keep-index-timestamp'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C Hamano
Merge bra
n
ch 'jc
/
rebase-i-
c
om
m
it-ms
g
-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
M
e
rge branch '
a
b/submodule-add-f'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io
C
Ha
m
a
n
o
M
erge
branch 'bc/mai
n
t-
m
akefile-fixes'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
Hamano
M
e
rg
e
branch '
m
a
i
nt'
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nied
e
r
D
o
c
umentation: ad
d
su
b
modul
e
.
* to the b
i
g
c
o
nfigurati
o
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
Jonatha
n
Nieder
gi
t
module
s
.
5
:
u
rl c
a
n be a rel
a
tive path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
Pavan Kumar Sunkara
git
w
eb:
fix esc_url
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jonatha
n
Nie
d
er
git --pagi
n
ate: p
a
ginate e
x
ternal c
o
mman
d
s a
g
ain
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jay
S
off
i
an
MERGE_RR is in
.
git, n
o
t
.
git/rr-cache
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next