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
Merge branch 'bw/union-merge-refactor'
2010-03-20
Jonathan Nie
d
e
r
Makefile: Fix occasiona
l
GIT-CFLAG
S
b
rea
k
age
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan
Niede
r
Makefile: Fi
x
CDPATH problem
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-28
Jonathan Nieder
Makefi
l
e:
c
l
arif
y
defin
i
tion of
TEST_
O
B
J
S
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-23
Jonat
h
an Nieder
am:
r
em
o
v
e rebase-
a
pply directory before gc
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-22
J
o
na
t
h
a
n N
i
e
d
er
t
e
sts:
F
ix race
condition in t7006-pager
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-21
Jon
a
than Nieder
t7006-pa
g
e
r
: if stdout is n
o
t a terminal, make a ne
w
o
n
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-20
Jon
a
than Nieder
test
s
:
Add tests for aut
o
matic use of pag
e
r
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan Nieder
am: Fix l
a
u
nching o
f
pager
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
Jona
t
han N
i
eder
git svn: Fix launching of
pa
g
e
r
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan Nieder
git
.
1: Clarify the beh
a
vior of the
--paginate option
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
Jona
t
han Nieder
Mak
e
'git var GIT_PAGER' always print the c
o
nfigured
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan Nieder
Fix 'git var' usa
g
e sy
n
opsis
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-31
Jonathan Nie
d
er
Makef
i
l
e
: always remove
.
de
p
end
directories on 'ma
k
e
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-31
Jonat
h
a
n
Nieder
Make
f
i
le: tuck away g
e
n
erated makefile frag
m
ents in
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-31
Jonathan Ni
e
der
Do not install shell li
b
rari
e
s
e
x
e
cutable
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-27
Jona
t
han Nieder
Teac
h
Make
f
ile to
c
heck header dependencies
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-27
Jonat
h
an Nieder
Makefile:
list standalone program object fil
e
s i
n
P
R
OG
R
AM_OBJS
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Ni
e
der
Makef
i
le: lazi
l
y compute header dependencies
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jon
a
than
N
ied
e
r
Makefile: list
gen
e
rated object f
i
les in OBJECTS
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jo
n
athan Nieder
Ma
k
efile:
d
isable default implicit r
u
les
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan
N
ie
d
er
M
a
kefile: rearrange de
p
e
n
dency rules
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nied
e
r
M
a
kefile:
t
ransport
.
o
d
e
pe
n
d
s on branch
.
h
n
o
w
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonath
a
n
Nieder
Merge branch 'm
a
s
ter'
o
f git://
r
epo
.
o
r
.
cz/alt-git into
.
.
.
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Ni
e
der
Makefile:
d
rop depende
n
cy on $
(
wildcard */*
.
h)
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
J
o
nathan N
i
eder
Makefi
l
e: clean up http-walker
.
o
de
p
e
nde
n
cy rul
e
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jona
t
h
a
n Nieder
Makefile: remove
wt
-
sta
t
u
s
.
h
fro
m
LIB_
H
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nie
d
e
r
Make
f
i
l
e:
ma
k
e sure t
e
st h
e
l
p
ers are rebu
i
lt when headers
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nieder
Mak
e
file: add mi
s
sing header
file dependencies
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan Nieder
Documentation:
merge: use MERGE_HEAD to refer to the
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan N
i
ed
e
r
D
o
cu
m
entation:
s
implify Ho
w
Merge Works
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
J
o
nathan N
i
e
der
Documentatio
n
:
merge: add a se
c
tion about fas
t
-forwa
r
d
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
Jona
t
han Nieder
Docu
m
entation: em
p
ha
s
ize wh
e
n git merge terminates
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
Jonatha
n
Nieder
D
o
cumentation: me
r
g
e: add an overvie
w
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
Jonatha
n
N
ieder
Document
a
tion
:
merge
:
move merge strategy list t
o
end
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan Nieder
Documentation: suggest `
r
eset --m
e
rge
`
in How Merge
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
J
o
n
athan Nie
d
er
Documentation: m
e
rge: move c
o
n
f
i
g
ura
t
ion sect
i
on to end
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Jonathan Ni
e
d
e
r
D
o
cumentation:
tiny gi
t
conf
i
g ma
n
u
a
l t
w
eak
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Jonathan Nieder
Doc
u
me
n
tation: g
i
t gc packs refs by default now
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Jonathan
N
ieder
Doc
u
mentatio
n
: tiny git
c
o
nfig manual tweaks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Jonathan Niede
r
Doc
u
mentation:
g
it gc packs refs by d
e
fault now
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-07
Jonathan N
i
eder
g
i
t-gui:
Makefile: consolidate
.
FORCE-* targets
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-06
Jonathan Nieder
M
a
kefile: consolidate
.
FORCE-* t
a
rge
t
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-06
Jonathan
Ni
e
der
M
akefil
e
: learn to g
e
nerate list
i
ngs
f
o
r targets requiring
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-06
J
onathan Nied
e
r
M
akefile:
u
s
e
targe
t
-spe
c
ific variab
l
e to pass flags
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-06
Jonathan N
i
eder
Makefil
e
: reg
e
n
e
rate assembler l
i
stings when
a
s
k
ed
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-06
Jo
n
atha
n
Ni
e
der
Makefile: make p
p
c/sha1p
p
c
.
o d
e
pend
o
n GIT-C
F
L
AG
S
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-28
Jonath
a
n Nieder
M
akefile: do
n
o
t clean
a
rm director
y
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-18
Jo
n
a
than Ni
e
der
S
p
eed u
p
b
ash completion loading
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-13
Jonathan Nieder
Provide a buil
d
time default
-
e
d
it
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
Jonath
a
n Nieder
am -i, git-svn: use "git var
GIT_PAGER"
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-13
J
o
n
athan Nieder
a
dd -i,
sen
d
-email, sv
n
,
p4, etc
:
use "git
v
ar
G
IT_
E
D
ITOR"
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
Jonat
h
a
n
Nie
d
er
Teach
g
it v
a
r
abou
t
GIT_EDITOR
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-13
Jonathan Nieder
Suppress warn
i
ngs from "
g
it va
r
-l"
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-13
J
o
nat
h
a
n N
i
ede
r
Do not use VISUAL editor on dumb terminals
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonatha
n
N
i
eder
d
iff --no-index: mak
e
the
u
sage string less scary
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jo
n
athan Nieder
merge-{recursive,s
u
btree}: use usagef
(
) to print usage
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan
N
ieder
Int
r
odu
c
e usagef() that takes a
p
ri
n
tf-style f
o
rm
a
t
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
J
ona
t
han Nieder
Le
t
'git <c
o
mmand> -h' sho
w
u
sage without a
g
it dir
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jo
n
athan Nieder
S
how usage str
i
n
g fo
r
'git http-push -h'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
J
o
nathan Nie
d
er
Let 'g
i
t htt
p
-fetch -h' show usag
e
outside any git
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
Show usage
s
tring for 'git stripspace -
h
'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonath
a
n
Niede
r
Show
usage string for '
g
it
unpack
-
file -h'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
J
onathan Nieder
Show usage string for 'git sh
o
w-index -h'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
J
o
nathan Nieder
Show
u
sag
e
string for
'
git rev-parse -h'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan
N
ieder
Show us
a
ge stri
n
g for 'gi
t
merge-one
-
file -h'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
J
o
nathan
N
ieder
S
h
o
w usage string for 'git mailsplit -h'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jon
a
t
han
N
i
eder
Show usage st
r
ing f
o
r 'git im
a
p
-s
e
nd -h'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan
N
ieder
Show usage st
r
ing fo
r
'git get-tar-commit-id
-h'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonatha
n
Nieder
Show usage string for 'git fast
-
impo
r
t -h'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jo
n
athan Nieder
Sho
w
us
a
ge s
t
ring for 'git check-ref-format -h'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jo
n
athan Nieder
http-fetch: add
mi
s
sing init
i
alization of ar
g
v0_path
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonat
h
an N
i
eder
merge:
do not setup worktree twice
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
che
c
k
-
ref-format: update
usage
s
tring
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
Show usage
st
r
ing
f
o
r
'
g
it show-ref -h'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonath
a
n Nied
e
r
Show usa
g
e
s
tring for 'git m
e
rge-ours -h'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jo
n
a
t
han Nieder
Show usa
g
e
string for
'git commit-tr
e
e -h'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jona
t
h
a
n Nieder
Show us
a
ge
s
tring for '
g
it cherry -h'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jon
a
t
h
an
N
ieder
S
h
ow usage string for '
g
it grep -h'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
J
o
nathan Nieder
R
etire fe
t
c
h--tool helper to contr
i
b
/exam
p
les
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-09
J
o
nathan Nieder
Add intermediate buil
d
pro
d
ucts to
.
gitignore
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-10-31
J
o
natha
n
N
ieder
Ha
n
dle more shell metacharacters in editor
n
ame
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-10-30
Jonathan Nieder
clo
n
e: d
e
tect extra arguments
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-10-13
J
o
nathan Nieder
c
h
ec
k
-ref-format: sim
p
lify --p
r
int implementa
t
ion
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-10-12
Jo
n
at
h
an
Nieder
Documen
t
ation:
d
e
scribe check
-
ref-f
o
rm
a
t --branch
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-10-12
J
onat
h
a
n
Nieder
Add tests for git check-
r
ef-fo
r
mat
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-10-10
Jonathan Nieder
Docum
e
ntation
:
clone: clarify discu
s
s
ion of initial
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-10-09
Jo
n
athan Nieder
racy-git
.
txt:
explain
n
s
e
c probl
e
m in more detail
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-10-09
Jonathan
N
ieder
D
o
cumentation: c
l
ari
f
y
"
w
orking tree"
defi
n
it
i
on
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-10-09
Jonat
h
a
n
Nieder
Documentation: c
l
a
r
ify branch crea
t
io
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-10-09
Jonathan Nie
d
er
Documenta
t
ion
:
branch: upda
t
e --merge
d
description
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-10-09
Jon
a
than Nieder
Documentation
:
clarify
mergeoptions d
e
scription
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-10-09
Jonathan Nied
e
r
Documentation: git fmt-m
e
rge-msg does not have t
o
b
e
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-10-09
Jonathan
Nied
e
r
Describ
e
DOCBOOK_XSL_172, ASCIIDOC_NO_ROFF
o
p
t
ions
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2008-08-24
Jonatha
n
Nie
d
er
Do
c
umentati
o
n: cla
r
i
fy pa
g
er configuration
Signed-off-by:
Jonathan Nieder
<jrnieder@uchicago.edu>
commit
|
commitdiff
|
tree
2008-08-24
J
o
nathan
N
ieder
Docu
m
ent
a
tion: clarify pager
.
<cmd> configuration
Signed-off-by:
Jonathan Nieder
<jrnieder@uchicago.edu>
commit
|
commitdiff
|
tree
2008-08-08
Jonathan Nie
d
er
Doc
u
mentati
o
n: user-manual: "gi
t
commit -a" does
n
't
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@uchicago.edu>
commit
|
commitdiff
|
tree
2008-08-02
Jonathan Nie
d
er
git-diff
(
1): "--c"
-> "--cc" typo fix
Signed-off-by:
Jonathan Nieder
<jrnieder@uchicago.edu>
commit
|
commitdiff
|
tree
2008-07-27
J
onathan Nieder
t6
0
30 (bi
s
ect): work around Mac O
S
X
"
ls
"
Signed-off-by:
Jonathan Nieder
<jrnieder@uchicago.edu>
commit
|
commitdiff
|
tree
2008-07-25
Jonathan Nieder
document that git-tag c
a
n tag more than heads
Signed-off-by:
Jonathan Nieder
<jrnieder@uchicago.edu>
commit
|
commitdiff
|
tree
next