repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Document new "already-merged" rule for branch -d
2010-04-15
Jonathan
Nieder
Document new "already-merge
d
" rule for branch -d
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
J
onathan Ni
e
der
Ma
k
e
f
i
l
e
: Fix CDPATH
problem
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-23
Jon
a
tha
n
Nieder
a
m
: remove rebase-apply directory befor
e
gc
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-22
Jo
n
athan Nieder
tests: Fix rac
e
con
d
ition
i
n
t7006-pager
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-21
J
onatha
n
Nieder
t70
0
6
-pager: if stdout is not a ter
m
inal, make
a
new one
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-20
Jonat
h
an
Niede
r
tests: Add
t
e
s
ts fo
r
aut
o
matic u
s
e of pager
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan Nieder
am: F
i
x
l
aunc
h
ing o
f
p
a
g
er
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jona
t
han Niede
r
git svn: Fix
l
a
u
nchi
n
g of pager
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan Ni
e
d
e
r
git
.
1:
C
lari
f
y the behavior of the --p
a
gi
n
ate option
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan
N
ieder
M
ake 'git var GIT_PAGER' al
w
ays print the configured
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan Nieder
F
i
x 'gi
t
var'
usage synopsis
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jonat
h
a
n
Nieder
D
o
cumentation: me
r
ge: use MER
G
E_HEA
D
to refer to
t
he
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan Nieder
Do
c
umentatio
n
: simpli
f
y How Merge Works
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan Nieder
Do
c
umentation: merge: add a
section a
b
o
u
t fast-
f
orward
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jona
t
han
N
ieder
Doc
u
mentation: emp
h
a
s
ize wh
e
n
git m
e
rge t
e
rminates
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan N
i
eder
D
o
cum
e
n
t
at
i
on: merge: add an o
v
erview
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jonatha
n
Nieder
Documentation: merge: move merg
e
s
t
r
ategy
l
is
t
to end
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan Nied
e
r
Documentation: suggest `reset --merge` in How Mer
g
e
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jon
a
than
N
i
e
der
Do
c
umen
t
ation: merge: move co
n
figuration section to en
d
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Jonath
a
n Nieder
D
o
cumentation
:
tin
y
git config man
u
a
l
tw
e
ak
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Jonathan N
i
eder
Doc
u
mentation:
git gc packs refs by
d
e
fault now
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Jonathan Nied
e
r
Documentation
:
ti
n
y g
i
t config man
u
al
t
weaks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Jonathan Nieder
Documentation: git gc p
a
cks r
e
fs by default
now
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-07
J
o
n
athan Nieder
git-gui: Makefile: consolid
a
te
.
FORCE-* targ
e
ts
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-06
Jonath
a
n Nie
d
er
Makefile: consoli
d
at
e
.
FORCE
-
* target
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-06
Jonat
h
an Nieder
Make
f
ile:
l
earn to generate listings f
o
r
targe
t
s req
u
iri
n
g
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-06
Jonathan Nieder
M
a
k
efile: use target
-
specific variable
to p
a
s
s f
l
a
gs
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-06
Jonathan
N
i
e
der
Makefile: regen
e
rate a
s
sembler listings when asked
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-06
J
o
na
t
h
a
n
Nieder
Ma
k
ef
i
le:
m
a
ke ppc
/
sha1pp
c
.
o dep
e
n
d on GIT-CFLAGS
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-28
Jo
n
athan Ni
e
der
Makefile: d
o
not clean arm dir
e
ctory
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-18
Jona
t
han Nie
d
er
Speed up bash com
p
le
t
ion
loadin
g
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jonat
h
an N
i
eder
Provid
e
a
b
uild time d
e
fault-edit
o
r setting
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jonat
h
an Nieder
am -i, git-sv
n
: use "git var GIT_PAGE
R
"
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
J
o
nathan Nieder
add -
i
, send-email,
s
v
n,
p
4, etc
:
use "git var GI
T
_ED
I
T
O
R
"
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jonathan Nieder
Teach git var about GIT_PAGER
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
J
o
n
athan Nieder
Teach git v
a
r a
b
out GIT_EDITOR
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jonathan Nieder
Su
p
press
w
arnings from
"
git var -l"
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jonatha
n
Nieder
Do no
t
use VISU
A
L ed
i
tor
o
n
dumb ter
m
i
nals
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jo
n
ath
a
n Nie
d
er
diff -
-
no
-
i
n
dex: make the usage str
i
ng les
s
scary
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jona
t
han
Nieder
merge-{recurs
i
ve,s
u
b
tree}: use us
a
gef() to print u
s
age
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nied
e
r
Intr
o
duce usagef(
)
that takes a printf-style fo
r
mat
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
L
e
t 'git <comman
d
> -h' s
h
ow us
a
g
e
wi
t
hout
a git dir
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan
Nieder
Show usage string for 'g
i
t http-pu
s
h -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan N
i
eder
Let 'git
h
tt
p
-fetch -h' show usa
g
e outsid
e
any git
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
Show
usage s
t
r
i
ng for 'git st
r
ipspace -h
'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
Show
usage string
f
o
r
'git
unpack-file
-h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan
N
ie
d
er
Show usa
g
e str
i
ng for 'git show-index -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan
N
ieder
Show usa
g
e
str
i
ng for 'git rev-parse
-
h
'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonatha
n
Ni
e
der
Show usa
g
e string for '
g
it merge-one-file
-
h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jo
n
athan Nieder
Show
usage string fo
r
'git mailsplit
-
h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonat
h
an Nieder
Show usage s
t
ring f
o
r 'git imap-sen
d
-h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jo
n
athan Nieder
S
ho
w
usage string for 'gi
t
get-tar-commit-id
-
h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jona
t
h
a
n Nieder
S
how u
s
age str
i
ng for '
g
it fast-import -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
Sho
w
u
s
a
g
e str
i
ng
f
o
r 'git che
c
k
-
r
ef-f
o
rmat -h
'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
J
o
n
athan Nieder
h
t
tp-fetch
:
add missing initialization of a
r
gv0_path
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nie
d
er
merge: do
n
ot
s
etup worktree twice
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
check-ref-forma
t
: u
p
d
a
te usa
g
e st
r
ing
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
J
ona
t
han Nie
d
er
Sho
w
u
sage string for 'g
i
t
s
h
ow-ref -
h
'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
Sh
o
w
usage
string
for
'
git merge-ours -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Ni
e
der
Show
u
s
age
str
i
ng fo
r
'
g
i
t
comm
i
t-tree -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
Show usage s
t
ri
n
g f
o
r
'
git cher
r
y -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nie
d
er
Show usag
e
st
r
i
n
g f
o
r
'
git grep -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan N
i
ed
e
r
Retire fetch--tool helper to contr
i
b/example
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-09
Jonathan Nieder
Add
intermedia
t
e bui
l
d pr
o
ducts
t
o
.
g
itignore
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-31
Jon
a
tha
n
Nieder
Han
d
l
e
more shell
m
etacharac
t
ers in edi
t
o
r n
a
mes
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-30
Jon
a
than Nieder
clone: detect extra argume
n
ts
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-13
Jonathan Nie
d
er
check-ref
-
fo
r
m
at
:
sim
p
li
f
y --print implement
a
t
io
n
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-12
Jonathan
N
ieder
Documentation
:
d
escribe check-ref-format --bra
n
ch
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-12
Jonathan Nieder
Add
tests
f
o
r git check-ref-format
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-10
Jonathan Nied
e
r
Do
c
um
e
ntation:
c
lon
e
: clarif
y
discus
s
ion of i
n
iti
a
l
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-09
Jonathan Nieder
racy-
g
i
t
.
txt: explain nsec problem in more de
t
ail
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-09
Jonathan Nieder
Docu
m
e
n
t
a
t
ion: c
l
arify "wo
r
king tree" de
f
initi
o
n
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-09
Jonathan Nied
e
r
Documentation: clarify branch crea
t
ion
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-09
Jonathan N
i
eder
Doc
u
mentation: b
r
a
nch:
u
p
dat
e
-
-merge
d
descr
i
ption
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-09
Jonathan Nieder
Documentation: clarify mergeoption
s
description
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-09
Jonathan Nieder
Docum
e
n
t
a
t
ion: git
fmt-m
e
rge
-
m
sg does
n
o
t
ha
v
e to be
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-09
Jon
a
than N
i
ed
e
r
De
s
cribe
D
O
CBOO
K
_
X
SL_172
,
ASCIIDOC_NO_ROF
F
options
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree