repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
compat: add mempcpy()
2010-03-21
Jonathan Nieder
compat: add mempcp
y
()
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Ni
e
der
checkout -m
-
-
c
o
nflict=diff3: add a label for anc
e
stor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merg
e
_trees(): add a
n
ce
s
tor label para
m
eter
for diff3
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
Niede
r
merge_file(): add comment explain
i
ng behavior wrt conflict
.
.
.
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
Ni
e
der
checkout --conflict=dif
f
3: add
a label f
o
r a
n
cestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
l
l
_merge():
a
d
d ancestor l
a
bel parameter
f
or diff3
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Ni
e
der
merge-file --d
i
ff3: ad
d
a label for ancestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
Ni
e
der
xdl_merge(): move fi
l
e1 and file2
l
abels to xmparam
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
xdl_merge(): a
d
d optional an
c
estor lab
e
l to diff3-sty
l
e
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
Nied
e
r
test
s
:
d
ocument che
r
ry-pic
k
be
h
avior in face of confli
c
ts
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han Niede
r
t
ests: documen
t
format
o
f conflicts from checkout -m
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan
N
ied
e
r
Makefile: Fix
occasio
n
al
GIT-CFLA
G
S
b
reakage
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jonath
a
n
N
ie
d
er
Makefile: Fix CDPATH problem
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-28
Jonathan Nie
d
e
r
Makefi
l
e: clarify defini
t
i
on of T
E
S
T
_
OBJS
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-23
Jonatha
n
Nieder
am: remove rebas
e
-apply directory b
e
fo
r
e gc
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-22
Jon
a
th
a
n
Nieder
tests: Fix
race condition in
t
7006-page
r
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-21
Jonat
h
an Nie
d
er
t7006-pag
e
r
: if std
o
ut is no
t
a terminal, make a
new one
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-20
Jonathan Nieder
tests: Add
t
e
sts
for automatic use of page
r
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jon
a
than Nieder
am: Fix launching of
p
ager
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jonat
h
an
Nied
e
r
gi
t
svn: F
i
x
l
a
u
nching of pager
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
J
o
nath
a
n Nieder
git
.
1: Clarify the behav
i
or of
the --paginate option
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan Nied
e
r
Make '
g
it var GIT_PAGER' always print
t
he c
o
nfigure
d
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jona
t
han Nieder
Fix 'git
var' usage synopsis
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-31
Jonathan
Nie
d
er
Makefile: always rem
o
v
e
.
de
p
end d
i
rectories
on 'make
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-31
Jonathan Ni
e
der
Makefile: tuck away genera
t
ed make
f
ile fragments in
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-31
Jonathan Nieder
Do not ins
t
all s
h
ell li
b
rari
e
s executable
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-27
Jo
n
athan Nie
d
er
T
each
M
akefile to c
h
eck header d
e
p
endencies
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-27
Jo
n
athan Ni
e
d
er
Makefile: list s
t
andalone pr
o
gram
o
b
j
e
ct
files in PROGRAM
_
OBJS
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
J
onathan
Nieder
Mak
e
file: lazily compute header dependencies
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonat
h
a
n
Niede
r
Mak
e
file: lis
t
g
e
nerated object
f
il
e
s
in OBJECTS
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
J
onathan Niede
r
Makefile: di
s
able default
i
m
p
licit rules
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nieder
Ma
k
e
file
:
rearrange depen
d
e
n
cy rules
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nieder
M
a
kefile: tra
n
sp
o
rt
.
o de
p
e
nds on b
r
a
n
ch
.
h
now
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Niede
r
Me
r
ge branch 'ma
s
ter
'
of git://repo
.
o
r
.
c
z
/alt-git in
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-26
J
o
nathan Nieder
Makefile: drop dependency on $(wildca
r
d */*
.
h)
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nieder
Mak
e
fil
e
: c
l
ean up http-walke
r
.
o
d
epen
d
ency rules
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Ni
e
der
Makefile: re
m
o
v
e w
t
-statu
s
.
h fr
o
m LIB
_
H
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
J
o
n
athan Nieder
Makef
i
le: make sure test hel
p
e
r
s
are rebuilt when
hea
d
ers
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nieder
M
a
kef
i
le: add missing
h
eade
r
file
d
ependen
c
i
e
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan Nie
d
er
Documentation: m
e
rge: use MERGE_HEAD to refe
r
to the
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jonatha
n
Nieder
Do
c
umentation: simpl
i
fy How Merge W
o
rks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan Nieder
Docum
e
ntation: m
e
rge: add a sect
i
on a
b
out fast-forward
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan
Nieder
Documenta
t
ion:
e
mphasize w
h
e
n gi
t
merge terminates
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jonath
a
n
Nieder
Documentation: merge: add an
o
vervi
e
w
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jona
t
ha
n
Nieder
Docume
n
tation: merge
:
move
merge strategy list to end
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jonat
h
an N
i
eder
Doc
u
ment
a
tion:
suggest `reset --merge`
i
n How Merge
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan Nieder
Do
c
um
e
ntation: merge: move configuratio
n
section to end
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
J
o
nathan Nieder
Documentation:
tiny git co
n
f
ig manua
l
tweaks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Jo
n
atha
n
Ni
e
de
r
Documentation: git gc packs refs by default no
w
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Jonath
a
n
Nie
d
er
Documentation
:
t
i
n
y git config
manual tweak
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Jo
n
athan Nie
d
er
D
o
cumentation: git gc pa
c
ks
refs by default now
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-07
Jonathan Nieder
git-gui: Makefi
l
e:
c
o
n
solidate
.
F
O
RCE-
*
target
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-06
Jonathan Nieder
Makefile:
c
onsolidate
.
FORCE-* targets
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-06
Jon
a
than
N
ieder
Makefile:
l
earn to
g
enerate listings
for ta
r
gets
r
equi
r
ing
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-06
J
onat
h
an Nieder
Make
f
ile: use target-specific va
r
i
a
ble
t
o pass flag
s
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-06
Jonath
a
n Nie
d
er
Makefile
:
rege
n
erate assem
b
ler li
s
ting
s
when asked
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-06
Jonathan
N
ieder
Ma
k
efil
e
: m
a
ke ppc/sha1ppc
.
o
depen
d
on
G
IT-CFLAGS
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-28
J
o
nathan N
i
eder
Mak
e
file: do
n
ot clean arm directory
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-18
Jona
t
han Nieder
Spe
e
d
u
p bash compl
e
tio
n
loading
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jonathan Nieder
Provide a build time default-editor
setting
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jonathan Nieder
a
m -i
,
git-s
v
n: u
s
e "git var GIT_PAGER"
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jo
n
athan Nieder
add -
i
,
se
n
d-email, svn, p4, etc: use
"g
i
t v
a
r GIT_EDITOR"
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jon
a
t
han
N
ieder
T
e
ach g
i
t v
a
r about GI
T
_PA
G
ER
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jonathan Niede
r
Teach git var a
b
out
GIT
_
ED
I
TOR
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jo
n
athan Nied
e
r
Suppr
e
ss warnings from "git var -l"
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jona
t
han N
i
e
der
Do not use VISUAL editor on
d
umb
t
erm
i
n
a
ls
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan
Nieder
diff --n
o
-index:
make the
u
s
age stri
n
g
l
ess scary
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jo
n
atha
n
Ni
e
der
merg
e
-{recursive,subtree}: use u
s
agef() to
print
usage
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
J
o
natha
n
Nieder
Introd
u
c
e
usagef(
)
that ta
k
es a printf-style format
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonatha
n
Nieder
Let 'git
<
c
o
mman
d
> -h' show
u
s
age
witho
u
t
a git
d
i
r
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonath
a
n Nieder
Sho
w
usage
st
r
ing for 'git http-push -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
J
onathan Nieder
Let 'git
h
ttp-fetch -h' show
usage outside a
n
y git
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jona
t
han Nieder
S
h
ow usage string f
o
r 'git stripspace
-
h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonat
h
an Nieder
Sh
o
w
u
sage string for 'git
u
npac
k
-file -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
Show usage st
r
in
g
for 'git show-i
n
de
x
-h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
S
h
o
w
u
sage
s
t
r
ing for 'git
rev-parse -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan
Nie
d
e
r
Show usage stri
n
g for 'git
m
e
rge-one-
f
ile -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan
Niede
r
Show us
a
ge string for 'git ma
i
lsplit -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
Show u
s
age string for 'git imap
-
send -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Niede
r
Show usage str
i
n
g
f
o
r 'git get-tar-commit-id -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jon
a
than Nieder
Show us
a
ge str
i
ng f
o
r 'git fast-impo
r
t -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
Show usage string
for 'git check-ref-
f
ormat -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jona
t
han Nieder
http-fetch: add missing
i
nitial
i
zat
i
on of ar
g
v0_path
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
J
o
nat
h
an N
i
eder
merge: do not setup
worktre
e
twice
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan
N
i
eder
check-ref-
f
ormat: update usage string
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
J
onathan Nieder
Show
u
sa
g
e string f
o
r 'git show-ref -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan
N
ieder
Show us
a
ge string for 'g
i
t merge-ours
-h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Ni
e
der
Show usage
s
t
ring
fo
r
'git
commit-tree
-h
'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
Show us
a
ge
s
tring for 'git
c
h
e
rry -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jo
n
athan Niede
r
S
ho
w
usage
s
tring for 'git g
r
ep -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nied
e
r
Retire f
e
tch--tool helper to contrib/examples
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-09
Jonathan Nieder
Add intermed
i
ate bui
l
d products
to
.
g
i
t
i
gnore
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-31
Jonathan Nieder
H
a
ndl
e
m
o
re shell
met
a
characters in e
d
itor n
a
m
es
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-30
Jonath
a
n
Nieder
clon
e
: det
e
ct
extra argum
e
nt
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-13
Jonatha
n
Nieder
c
h
eck-re
f
-format: simplify --
p
rint implementation
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-12
Jonathan Nieder
D
ocumenta
t
io
n
: describ
e
che
c
k-ref-fo
r
mat --branch
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-12
J
onathan Nieder
Add tests for git check-ref
-
format
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-10
Jonathan Nieder
Documentation: c
l
one: clarify discussi
o
n of i
n
itial
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-09
Jonat
h
an
Nieder
racy-git
.
t
x
t:
explain n
s
e
c pro
b
lem in more de
t
ail
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-09
Jona
t
h
an Nieder
Documen
t
ation: clari
f
y "
w
orking t
r
ee" definition
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
next