repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Provide 'git merge --abort' as a synonym to 'git reset --merge'
2010-11-17
Johan He
r
land
Pr
o
vide 'git merge --abort
'
as a syn
o
nym to
'
g
i
t
reset
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an Herla
n
d
cmd_merg
e
(): Pa
r
se op
t
ion
s
before check
i
ng MERGE_HEAD
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
l
a
nd
Pr
o
vide 'git notes get-ref' to e
a
sily retrieve
current
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
r
l
and
git notes merge: Add testca
s
e
s for
merging 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
J
ohan Her
l
a
n
d
g
it n
o
tes merge: Add another
a
u
to-
r
esolving strategy
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
He
r
land
g
it notes mer
g
e: --commit
shoul
d
fail if
u
n
d
erlying
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
Herland
git notes merge: List conflic
t
ing notes in notes merge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Her
l
and
git notes
merg
e
:
M
anual conflict
resolut
i
on, pa
r
t 2/2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herl
a
n
d
git notes me
r
ge: Manual c
o
nf
l
ict resolution, p
a
rt
1/2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
Document
a
tion: P
r
elimi
n
ary doc
s
o
n
'g
i
t
notes merge'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
git notes merge: Add
automa
t
ic
c
o
nflict resolver
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
a
n Herl
a
nd
git notes merge: Handle real, non-conflicting notes
.
.
.
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
erland
bui
l
ti
n
/notes
.
c
:
Refactor c
r
eatio
n
of notes commits
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git n
o
tes me
r
ge: Init
i
a
l implementation 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
Johan
H
erla
n
d
b
u
iltin/notes
.
c
:
Spli
t
notes r
e
f DWIMmery into a sep
a
rate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
notes
.
c
: Us
e
two newlin
e
s
(instead of one) when
c
oncat
e
nat
i
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
(trivial) t
3
3
03:
I
n
dent
with t
a
bs instead of spaces
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han H
e
r
land
notes
.
h/c:
P
ropagate com
b
ine_note
s
_fn return value
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
erland
notes
.
h/c: Al
l
ow comb
i
n
e_notes fu
n
ctio
n
s to remove
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
a
n
He
r
land
notes
.
c
:
Reorder functions in
preparation for next
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h: Make default_notes_ref() a
v
a
i
l
a
b
l
e
i
n
notes API
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(trivial) not
e
s
.
h: Minor documentation fixes to copy_notes()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herland
notes
.
c: Hexify SHA
1
in die() message
from
init_not
e
s()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
René S
c
h
a
rfe
n
o
t
e
s:
allow --dr
y
-run for -n and --verbose for -v
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
M
a
tthieu
Moy
Doc
u
ment
-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
Doc
u
mentat
i
on:
c
ite git-am f
r
o
m
g
it-ap
p
ly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Thomas
R
ast
t700
3
:
f
i
x subdi
r
ectory-filter
t
est
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonath
a
n Nieder
Allow
"
che
c
k
-
r
ef
-
format --branch" from su
b
directory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nieder
check-r
e
f-f
o
rmat:
han
d
le
subco
m
m
a
nds
i
n
s
eparate functions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-05
Matthieu M
o
y
p
retty-options
.
t
x
t: ma
t
ch --format's documentation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-03
Junio C Hamano
Merge bra
n
ch 'sv/maint
-
d
i
ff-q-clear-fi
x
' into maint
commit
|
commitdiff
|
tree
2010-08-03
Junio C H
a
ma
n
o
M
e
rge bra
n
ch 'rr/s
v
n-fe
'
into m
a
int
commit
|
commitdiff
|
tree
2010-08-03
J
unio C Hamano
Merge br
a
nch
'
pt/git
-
gui'
i
nto main
t
commit
|
commitdiff
|
tree
2010-08-03
Ra
m
kumar Ramachandra
c
o
ntrib/svn-fe:
A
dd the svn-fe targ
e
t to
.
g
i
t
ignore
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-03
Ramkum
a
r Ramachandr
a
con
t
rib/
s
vn-fe: Fix I
n
cl
u
dePat
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Junio C Hamano
Merge
b
ranch 'ab/tap' into maint
commit
|
commitdiff
|
tree
2010-08-02
Æv
a
r Ar
n
fjörð
B
jarma
s
o
n
t
est-l
i
b: R
e
move
3
y
ear old no-op
-
-no-python option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Æv
a
r
Arnfjörð Bjarma
s
o
n
test
-
lib: Ignore --quiet und
e
r
a TAP ha
r
ness
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Junio C Hama
n
o
Merge git
:
/
/
repo
.
or
.
cz/
g
it-gui int
o
pt/git-gui
commit
|
commitdiff
|
tree
2010-08-02
Thoma
s
Rast
Documentati
o
n
/
rev-parse: quoting is required with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Junio C
Hamano
Documentation: re
p
orting bugs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Junio C Ha
m
ano
Fix DIFF_
Q
UEUE
_
CLEAR
r
e
factoring
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-28
Davi
d
D
.
Kilz
e
r
F
ix git rebase
--continue to wo
r
k wi
t
h
touched fil
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-28
M
atthieu M
o
y
Document ls-files -t as semi
-
o
b
sole
t
e
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Junio C Hamano
Gi
t
1
.
7
.
2
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Juni
o
C Ham
a
no
Sync with 1
.
7
.
1
.
2
commit
|
commitdiff
|
tree
2010-07-27
Junio 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 Hamano
Syn
c
with
1
.
7
.
0 s
e
r
i
es
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 Niede
r
con
f
ig --get --path: che
c
k
for unset $HOM
E
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Step
h
en Boyd
c
o
m
mit: r
e
move fu
l
l
s
top from usage help for
-
u
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Matthie
u
Moy
Clarify help messa
g
e
w
h
en n
o
remote is
specified in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Th
o
mas Rast
Makefile: add check-docs exce
p
t
ion for
gitrevi
s
i
o
ns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Thomas Rast
Fix 'git' wrapper usage
string
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
T
h
o
mas Rast
Documen
t
at
i
on/git-pu
s
h: Explain st
a
tus outp
u
t in
m
ore
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Thomas Rast
D
o
cument receive
.
denyDeleteCurren
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Th
o
mas Ra
s
t
Cast ex
e
cl*
(
) NU
L
L sentine
l
s
to (char *)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Nguyễn T
h
ái Ngọc
D
uy
git-read
-
tree
.
txt: acknow
l
edge
t
he
d
i
r
ectory matching
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Jon Seymour
I
NSTALL:
c
onf
i
g
ure /etc/
x
ml/catalog to build docs on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Johannes Six
t
t3700
-
add
:
f
ix d
e
pendence on stdout and s
t
derr buffering
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Brando
n
Casey
g
it-rebase--int
e
rac
t
ive
.
sh: use
p
rintf instead of
e
cho
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Nathan
W
.
Panike
Add a goog
l
e-
c
hrome o
p
tion for w
e
b-
-
browse
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Junio
C
Hamano
M
er
g
e branc
h
'maint-1
.
7
.
1' into m
a
int
commit
|
commitdiff
|
tree
2010-07-26
Juni
o
C Ham
a
no
Merge br
a
nch 'ma
i
nt-1
.
7
.
0'
i
nto ma
i
nt-1
.
7
.
1
commit
|
commitdiff
|
tree
2010-07-26
J
u
nio C Hamano
Merge branch 'maint-1
.
6
.
6'
i
nto mai
n
t
-1
.
7
.
0
commit
|
commitdiff
|
tree
2010-07-26
Junio C Haman
o
Merge br
a
nch 'main
t
-1
.
6
.
5' into m
a
i
nt-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-07-26
Stephen Boyd
request-pull
.
txt:
D
oc
u
m
e
nt -p option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Junio
C
H
aman
o
Merge bran
c
h 'maint-1
.
6
.
4' into
m
aint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-07-25
Greg
B
ro
c
kman
Check size of
path bu
f
fer b
e
fore
w
ritin
g
into it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
J
u
nio
C
Hamano
Gi
t
1
.
7
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Junio C Ha
m
a
n
o
tests: correct "
d
o
e
s re
f
log exist
?
" tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
B
ra
n
don Casey
t/:
work aroun
d
one-
s
hot variable assignment with test_must_fail
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Jonatha
n
Ni
e
der
t/REA
D
ME: correct an exception
w
he
n
b
r
eaki
n
g a && chain
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Brandon
C
a
s
e
y
t/{t5
5
41
,
lib-http
d
}: rep
l
ace probl
e
matic '!()' n
o
t
a
t
ion
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Brandon Casey
t/t370
0
: convert two uses of n
e
gation ope
r
ator '!'
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
J
unio C Hamano
Merge b
r
a
nch 'm
a
int'
commit
|
commitdiff
|
tree
2010-07-20
Brand
o
n
C
a
se
y
t
/
README: cla
r
ify t
e
st
_
must_fai
l
description
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Greg Brockman
Ch
e
ck size
o
f path
b
uffer b
e
fore wr
i
ting
i
nto it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
J
u
nio
C Ham
a
no
M
erge bra
n
ch
'
ma
i
nt'
commit
|
commitdiff
|
tree
2010-07-19
Ral
f
Thielow
updat
e
-ser
v
er-in
f
o: Shorten
r
ead_pack_
i
nfo_file()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arn
f
jörð
Bj
a
rmason
gi
t
a
d
d: Add --i
g
nore-m
i
ssing
to
SY
N
OPSIS
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arn
f
j
ö
rð Bjarma
s
on
git submodule add: Remove o
l
d doc
s
about i
m
plicit -f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Jens Lehmann
g
it submodule add:
Require t
h
e new --force o
p
tion to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ju
n
io C Hamano
Merge bran
c
h
'jl/add-n-ignore-miss
i
ng'
commit
|
commitdiff
|
tree
2010-07-19
David
A
guil
a
r
Docu
m
entation: Expl
a
in git-mergetool's use of temporary
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Junio C Hamano
Me
r
ge branch 'j
c
/d
i
ff-me
r
ge-ba
s
e-multi'
commit
|
commitdiff
|
tree
2010-07-16
T
homas Rast
Only run aggregate-
r
esults over ac
t
ual count
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Jon
a
than Ni
e
d
e
r
A
dd a
s
ample user
for the svndump library
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Junio
C Hamano
d
if
f
A
.
.
.
B:
do not limit the syntax too na
r
ro
w
ly
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
M
e
rge
branch
'
jn/paginate-fix
'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C Hamano
Merge branch
'wp/merge-tree-fix'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C Hamano
Merge
b
r
anch 'js/merge-rr-f
i
x'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge branc
h
'j
c
/
d
iff-merge-base-m
u
lti'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io
C
H
amano
M
e
rge
b
ranch
'ns/merg
e
-recur
s
ive-upto
d
a
t
e'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge branch 'jn/tests'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge branch
'
eb/doc-log-manpage'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
M
erge br
a
nch 'jn/
g
rep-open'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hama
n
o
Merge b
r
a
n
ch '
m
g/revision-doc
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge b
r
anch 'jk/maint-
s
t
a
t
us-keep-index-time
s
ta
m
p'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
H
am
a
no
M
erge branch 'jc/r
e
bas
e
-i-co
m
m
it-msg
-
fix'
commit
|
commitdiff
|
tree
next