repo.or.cz
/
git
/
dkf.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation: merge: use MERGE_HEAD to refer to the remote branch
2010-01-24
Jo
n
a
than
Nieder
D
o
c
um
e
nta
t
ion
:
merge: use M
E
RGE_
H
E
A
D to refer to the
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan N
i
e
d
er
Documentation: simplify How Merge
W
orks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
J
o
n
at
h
an Nieder
Documentation:
m
erge
:
add a section about
f
a
st-forward
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan Nieder
Documentat
i
on: emphasiz
e
when gi
t
merge
t
er
m
in
a
tes
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jo
n
athan Ni
e
der
Documenta
t
ion: merge: a
d
d an overv
i
ew
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jo
n
athan N
i
ed
e
r
Doc
u
mentation: merge: move
m
erge strategy list t
o
end
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan Nieder
Document
a
tion: suggest
`
r
e
set --merge`
in How Merge
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jonat
h
a
n
N
ieder
Documentat
i
on: merge: move confi
g
u
r
ation section t
o
end
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Jonath
a
n
Nied
e
r
Documentation: t
i
n
y
g
it confi
g
manual tweaks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Jonatha
n
Nieder
Documentation: g
i
t gc
p
a
cks re
f
s by default now
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-06
Jonathan Nieder
Makefile: make pp
c
/sha1p
p
c
.
o de
p
end on GIT-CFLAGS
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-28
Jo
n
at
h
an
Nied
e
r
Makefile
:
do n
o
t c
l
ean arm dir
e
ctory
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-18
Jonathan Nieder
S
peed up bash compl
e
tion loadi
n
g
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jonathan Nieder
Pr
o
vide a b
u
ild
t
ime defa
u
lt-editor se
t
ting
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jonathan Nie
d
er
am
-
i,
g
it-svn:
u
s
e
"git var GIT_PAGER"
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jonat
h
a
n Nieder
a
dd -i,
s
end-email, svn, p4, etc: use "g
i
t
var
GIT_E
D
ITOR"
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jonathan Nieder
Teach git var
a
b
out GIT_PAGER
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
J
o
nathan
N
ieder
Teach git var about GIT_EDITOR
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jon
a
tha
n
Nieder
Supp
r
e
s
s w
a
rnings
f
rom
"git var -l
"
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
J
o
n
a
than Nieder
Do not use VISUA
L
edi
t
or
on dumb terminals
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonath
a
n Nieder
d
i
ff
-
-no-index: make the us
a
ge string less
s
c
ary
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
J
o
nathan Nieder
merge-{recu
r
sive
,
s
u
btree}: use usagef() t
o
print usage
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
J
o
nat
h
an Nieder
Introduce
u
s
a
gef() that
takes a pri
n
tf-style
fo
r
mat
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
J
onathan
N
i
e
der
Let 'git <command
>
-h'
sho
w
usa
g
e w
i
t
hout a
git d
i
r
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
J
ona
t
han Ni
e
der
Show usage s
t
ring for 'git htt
p
-push -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
Let 'git http-fet
c
h -h' show usa
g
e outside
a
ny g
i
t
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jon
a
than Nieder
S
h
ow usa
g
e
stri
n
g
for 'git strips
p
ace -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonat
h
a
n Nieder
Show us
a
g
e stri
n
g fo
r
'git un
p
a
c
k-
f
ile -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jona
t
han Nieder
S
how usage
s
tring for 'git sho
w
-ind
e
x -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jona
t
han N
i
ede
r
Show
usage str
i
ng for 'git rev-parse -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonat
h
a
n N
i
ede
r
Show usag
e
string for 'git
merge
-
one-
f
i
l
e -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jon
a
t
h
a
n Nieder
Show u
s
age string for 'git mailsplit -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonat
h
an Nieder
Sho
w
usage string for
'
g
i
t imap-se
n
d
-h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
J
o
nathan
N
i
e
der
Show usage string for '
g
it get-
t
ar-commit-id -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
J
o
na
t
han Nieder
Show
usage string for 'git fast-import -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonatha
n
Nieder
Show usage string f
o
r '
g
it check-ref-fo
r
mat -
h
'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonath
a
n Niede
r
http-
f
etch: add
missing initiali
z
ation of
a
r
gv0_
p
ath
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
merge: do not setup worktree twice
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nie
d
er
check-ref-f
o
rmat:
u
pd
a
te usage strin
g
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonath
a
n Niede
r
S
how usage string
f
o
r 'git show-ref
-
h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
Show usage
string for 'git merge-ours -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
S
how usage string for 'git co
m
mit-tree
-h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonath
a
n Nied
e
r
Sh
o
w usage string for 'git
c
h
e
rry
-
h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonat
h
an
N
i
e
der
Show usage string
f
or 'git g
r
ep
-
h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
J
o
n
a
than Nieder
Retire
f
e
tch--tool helper to contrib/example
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-09
Jonathan Nieder
Add intermediate
bui
l
d products
t
o
.
g
i
tignore
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-31
J
o
na
t
han Ni
e
der
Handle more she
l
l m
e
tacharacters in
e
ditor names
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-30
Jonathan Nieder
clone:
d
etect extra argu
m
ents
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-13
Jo
n
at
h
an
N
ieder
c
heck-
r
e
f
-fo
r
mat: simp
l
if
y
--pri
n
t impl
e
m
e
ntation
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-12
Jonathan Ni
e
d
er
Doc
u
m
entation: d
e
sc
r
i
be ch
e
ck-
r
ef-format --branch
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-12
Jonat
h
an Nie
d
e
r
Add tests for
g
it
check-ref
-
format
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-10
Jonathan Nie
d
er
Docum
e
ntation: clo
n
e: cl
a
ri
f
y
d
iscussio
n
of initia
l
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-09
Jonathan Nieder
rac
y
-git
.
txt: exp
l
ain nsec
p
roblem in more de
t
ail
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-09
Jonath
a
n Nied
e
r
Documentation:
c
larify "w
o
rk
i
ng tree" defini
t
ion
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-09
Jonathan Ni
e
der
Docume
n
tation: clari
f
y branch creat
i
on
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-09
Jonathan Nieder
Documenta
t
i
o
n: branch
:
update
-
-
merged
d
e
scri
p
tion
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-09
J
ona
t
han Niede
r
D
o
cumen
t
ation: clarify mer
g
eop
t
ion
s
description
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-09
Jonathan Nieder
Documentation: git fmt-merge
-
msg does not hav
e
to b
e
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-09
Jonathan
N
ieder
Describ
e
D
O
CBOOK_X
S
L_172, ASCIID
O
C
_NO_RO
F
F
options
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree