repo.or.cz
/
git
/
mingw
/
4msysgit
/
gitPS1fix.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Makefile: transport.o depends on branch.h now
2010-01-26
Jon
a
than Nieder
M
a
k
efil
e
: tra
n
spor
t
.
o depends on branc
h
.
h now
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nieder
Merge branch
'master' o
f
git:/
/
repo
.
or
.
cz/alt
-
git into
.
.
.
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nied
e
r
Ma
k
efile: drop dependency on $(w
i
ld
c
ard */*
.
h)
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan
Nieder
Makefile: clea
n
up
http-walker
.
o
d
e
p
endency rules
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
J
o
nathan Ni
e
der
Ma
k
efile: remove wt
-
status
.
h from LIB_H
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jona
t
han Nieder
Makefile: make sure test h
e
lper
s
are
r
ebuilt when header
s
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
J
onathan Nieder
Makefile: add m
i
ssing header file depend
e
ncies
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan
N
ied
e
r
D
o
cumenta
t
ion: merge: use MERGE_HEA
D
to refer
to
the
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
J
onath
a
n
N
ieder
D
ocumentation: si
m
p
l
i
f
y Ho
w
M
erge Works
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
J
onathan Nieder
Documentation: me
r
ge: add a section about fast-forwa
r
d
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan Nieder
Documentati
o
n: emphasize when git merge terminates
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan N
i
eder
Do
c
umentation
:
m
erge: add an overview
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan Nieder
Docu
m
entation:
m
e
rge: move merge strategy list to
e
n
d
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan Nieder
Do
c
umentatio
n
: sugges
t
`reset --merge` i
n
How Merge
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jonatha
n
Ni
e
der
Documentation: merge:
m
o
ve configuration sectio
n
to end
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Jonathan Nieder
Document
a
tion: tiny git confi
g
manual tweaks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Jon
a
than Nieder
Docum
e
ntation: git
g
c
packs
r
efs by default n
o
w
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Jonathan
Nieder
Docu
m
e
n
tat
i
o
n
: tin
y
git confi
g
manual tweaks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Jon
a
than N
i
eder
Doc
u
mentation: g
i
t g
c
packs
re
f
s by default now
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-07
J
onathan N
i
eder
g
it-
g
ui:
Makefile: co
n
solid
a
te
.
FORCE-
*
targ
e
ts
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-06
Jonathan Nieder
M
akefile: consolidat
e
.
F
O
RCE-* targets
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-06
Jonathan Nieder
M
a
kefil
e
: learn t
o
generate l
i
sting
s
for targets requiring
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-06
Jonathan
N
ie
d
er
Makef
i
le: use
t
ar
g
et
-
specific variable
to pas
s
flags
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-06
J
onathan Nied
e
r
Make
f
i
l
e: regenerate assembler li
s
tings when asked
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-06
Jonathan Nieder
Makefi
l
e: make ppc/s
h
a1ppc
.
o
d
ep
e
nd on GIT-CFLAGS
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-28
Jonathan Nieder
Makefile: d
o
n
ot clean
a
rm directory
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-18
Jon
a
t
h
an Nie
d
er
Spe
e
d up
b
ash com
p
letion lo
a
d
ing
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jonathan Nied
e
r
Provide a buil
d
t
ime default-
e
di
t
o
r
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 Nieder
am
-i,
g
it-svn: use "git var GIT_PAGER"
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jonathan N
i
eder
add -i, send-email, sv
n
, p4
,
etc: use "
g
i
t var GI
T
_EDITOR"
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jonatha
n
N
i
eder
T
e
ach git
var abo
u
t
GIT_PAGER
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jonathan Nie
d
er
Teach g
i
t var about G
I
T
_
EDITOR
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
J
onathan
N
ieder
Suppress warnings fr
o
m "git v
a
r -
l
"
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
J
onatha
n
Nieder
Do n
o
t use
VISUAL editor on dumb terminals
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
J
onath
a
n
Niede
r
diff --no-ind
e
x
:
make the usage strin
g
less scary
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jon
a
than N
i
eder
merge-{recursive,
s
ubtree
}
:
u
se usagef() to print usage
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
J
o
nathan Nie
d
er
Int
r
oduce usagef
(
) that t
a
kes a printf-style format
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan
Nieder
Let 'git <comma
n
d
>
-h' show usag
e
with
o
ut
a
git dir
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan
N
ieder
S
h
o
w
usage string for 'git ht
t
p-pu
s
h -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
J
onathan Ni
e
d
er
Let 'git h
t
tp-f
e
tch -h' show
usag
e
o
u
ts
i
de any git
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jon
a
than Nieder
Show
usage string
for 'g
i
t stripspace
-
h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jo
n
athan Niede
r
S
how usa
g
e string for 'git u
n
pack-file
-
h
'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan
N
ieder
Sh
o
w us
a
ge string for
'git s
h
ow-index -
h
'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
J
o
nathan Nied
e
r
Show usage string for '
g
i
t rev-parse -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nie
d
er
Show usage string for 'gi
t
merge-one-file -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
S
ho
w
usage st
r
i
n
g
fo
r
'git mailsplit -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nied
e
r
Show usage
s
t
r
ing for 'git i
m
ap-sen
d
-h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
J
o
n
a
t
han Nieder
Show usage s
t
ri
n
g for 'git g
e
t-tar-comm
i
t-id -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jon
a
t
h
an Nieder
S
h
ow usage
s
t
r
ing for 'git
f
ast-import -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nied
e
r
Show usage str
i
ng fo
r
'git check-ref-format -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonat
h
an Niede
r
http-fetch: add missing initia
l
ization
o
f argv0_path
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan
Nieder
merge: d
o
not setup work
t
ree twice
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nie
d
er
check-ref-format: update
usage string
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
J
ona
t
h
an Nieder
Sho
w
usage str
i
ng for 'git s
h
ow-ref
-
h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jo
n
athan Nieder
Show usage string for '
g
it merg
e
-ours
-h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
Show usage string f
o
r 'g
i
t co
m
mit-tre
e
-h
'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nied
e
r
Show
u
sage strin
g
for 'git cherry
-h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
J
onathan Nied
e
r
Show usage string for 'g
i
t
g
re
p
-
h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jo
n
athan Nieder
Ret
i
re f
e
tch
-
-tool helpe
r
to contri
b
/e
x
amples
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-09
Jonathan Ni
e
d
e
r
Add intermedia
t
e bu
i
l
d pr
o
du
c
ts to
.
gitignore
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-31
Jonathan Nieder
Ha
n
d
l
e
m
ore shell me
t
acharacte
r
s in
e
d
itor nam
e
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-30
J
onathan Nied
e
r
clone:
detect extra
a
rg
u
ments
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-13
Jonathan
N
i
eder
check-
r
ef-format: simplify --print
i
mp
l
ementa
t
ion
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-12
Jona
t
han Nieder
Document
a
tion: describe chec
k
-r
e
f-format --
b
ranch
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-12
Jonathan Nied
e
r
Add test
s
for
g
it check-ref-format
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-10
Jo
n
athan Nieder
Documentation: clone: cla
r
ify
d
iscussion
of init
i
a
l
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-09
Jonathan N
i
e
d
er
racy-git
.
txt: explain nsec proble
m
in more detail
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-09
Jonathan Nieder
D
o
c
ume
n
t
a
tion: clarify "wo
r
king tree" de
f
inition
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-09
Jonathan Nieder
Documentati
o
n: clar
i
f
y
bran
c
h
creation
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-09
Jon
a
t
han Ni
e
der
Do
c
umenta
t
i
o
n: b
r
anch: upda
t
e -
-
merged des
c
riptio
n
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-09
Jonathan Nieder
D
ocume
n
tation: clari
f
y
mer
g
eoptions
d
e
scription
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-09
Jonathan
Nieder
Documentati
o
n: git
f
m
t
-merge-ms
g
does
n
ot have t
o
be
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-09
Jon
a
tha
n
Ni
e
der
De
s
cribe DOCBOOK_XSL_172, ASCIIDOC_NO_ROF
F
o
ption
s
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree