Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Make --raw option available for all diff commands | Timo Hirvonen | 2006-06-26 | 2 | -36/+14 |
* | Merge with_raw, with_stat and summary variables to output_format | Timo Hirvonen | 2006-06-26 | 6 | -144/+136 |
* | Merge branch 'jc/squash' | Junio C Hamano | 2006-06-26 | 5 | -24/+72 |
|\ | |||||
| * | git-merge --squash | Junio C Hamano | 2006-06-24 | 5 | -24/+72 |
* | | Merge branch 'jc/diff' | Junio C Hamano | 2006-06-26 | 2 | -15/+80 |
|\ \ | |||||
| * | | diff --color: use $GIT_DIR/config | Junio C Hamano | 2006-06-25 | 2 | -15/+80 |
* | | | Merge branch 'ml/cvsimport' | Junio C Hamano | 2006-06-26 | 1 | -17/+23 |
|\ \ \ | |||||
| * | | | cvsimport: always set $ENV{GIT_INDEX_FILE} to $index{$branch} | Johannes Schindelin | 2006-06-24 | 1 | -7/+8 |
| * | | | cvsimport: setup indexes correctly for ancestors and incremental imports | Martin Langhoff | 2006-06-24 | 1 | -17/+22 |
* | | | | Merge branch 'js/diff' | Junio C Hamano | 2006-06-26 | 9 | -20/+81 |
|\ \ \ \ | |||||
| * | | | | Teach diff about -b and -w flags | Johannes Schindelin | 2006-06-23 | 9 | -20/+81 |
* | | | | | Merge branch 'ew/rebase' | Junio C Hamano | 2006-06-26 | 4 | -24/+90 |
|\ \ \ \ \ | |||||
| * | | | | | rebase: allow --skip to work with --merge | Eric Wong | 2006-06-25 | 3 | -2/+73 |
| * | | | | | rebase: cleanup rebasing with --merge | Eric Wong | 2006-06-25 | 1 | -28/+5 |
| * | | | | | rebase: allow --merge option to handle patches merged upstream | Eric Wong | 2006-06-25 | 2 | -5/+23 |
| | |_|/ / | |/| | | | |||||
* | | | | | Fix pkt-line.h to compile with a non-GCC compiler | Dennis Stosberg | 2006-06-26 | 1 | -0/+2 |
* | | | | | Solaris needs inclusion of signal.h for signal() | Dennis Stosberg | 2006-06-26 | 2 | -0/+2 |
* | | | | | correct documentation for git grep | Matthias Lederhofer | 2006-06-25 | 1 | -1/+6 |
|/ / / / | |||||
* | | | | git-commit: filter out log message lines only when editor was run. | Yann Dirson | 2006-06-25 | 1 | -7/+12 |
* | | | | Rename safe_strncpy() to strlcpy(). | Peter Eriksen | 2006-06-24 | 12 | -30/+48 |
* | | | | apply: replace NO_ACCURATE_DIFF with --inaccurate-eof runtime flag. | Johannes Schindelin | 2006-06-24 | 1 | -9/+16 |
* | | | | Clean up diff.c | Timo Hirvonen | 2006-06-24 | 1 | -12/+6 |
| |/ / |/| | | |||||
* | | | repo-config: fix printing of bool | Junio C Hamano | 2006-06-24 | 1 | -6/+3 |
* | | | diff --color: use reset sequence when we mean reset. | Junio C Hamano | 2006-06-24 | 1 | -1/+1 |
* | | | git-repack -- respect -q and be quiet | Martin Langhoff | 2006-06-24 | 1 | -2/+3 |
| |/ |/| | |||||
* | | git-pull: abort when fmt-merge-msg fails. | Junio C Hamano | 2006-06-24 | 1 | -1/+1 |
* | | Merge branch 'pb/error' | Junio C Hamano | 2006-06-24 | 5 | -6/+52 |
|\ \ | |||||
| * | | usage: minimum type fix. | Junio C Hamano | 2006-06-24 | 1 | -3/+3 |
| * | | Customizable error handlers | Petr Baudis | 2006-06-24 | 2 | -4/+46 |
| * | | git-merge: Don't use -p when outputting summary | Timo Hirvonen | 2006-06-23 | 1 | -1/+1 |
| |/ | |||||
| * | git-commit: allow -e option anywhere on command line | Jeff King | 2006-06-23 | 1 | -1/+3 |
| * | patch-id: take "commit" prefix as well as "diff-tree" prefix | Johannes Schindelin | 2006-06-23 | 1 | -0/+2 |
* | | Makefile: do not recompile main programs when libraries have changed. | Junio C Hamano | 2006-06-22 | 1 | -1/+1 |
|/ | |||||
* | add GIT-CFLAGS to .gitignore | Matthias Kestenholz | 2006-06-22 | 1 | -0/+1 |
* | Tweak diff colors | Linus Torvalds | 2006-06-22 | 1 | -41/+58 |
* | Merge branch 'master' into nextv1.4.1-rc1 | Junio C Hamano | 2006-06-22 | 4 | -8/+34 |
|\ | |||||
| * | Merge branch 'js/lsfix' | Junio C Hamano | 2006-06-22 | 9 | -127/+200 |
| |\ | |||||
| * \ | Merge branch 'ew/rebase' | Junio C Hamano | 2006-06-22 | 3 | -10/+320 |
| |\ \ | |||||
| * \ \ | Merge branch 'jn/web' | Junio C Hamano | 2006-06-22 | 2 | -127/+490 |
| |\ \ \ | |||||
| * \ \ \ | Merge early parts of branch 'js/diff' | Junio C Hamano | 2006-06-22 | 3 | -11/+73 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jc/upload-corrupt' | Junio C Hamano | 2006-06-22 | 17 | -293/+338 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jc/waitpid' | Junio C Hamano | 2006-06-22 | 3 | -0/+15 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'ff/c99' | Junio C Hamano | 2006-06-22 | 24 | -107/+122 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'pb/config' | Junio C Hamano | 2006-06-22 | 5 | -11/+107 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'lt/objlist' | Junio C Hamano | 2006-06-22 | 14 | -131/+151 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | git-svn: fix commit --edit flag when using SVN:: libraries | Eric Wong | 2006-06-22 | 1 | -6/+8 |
| * | | | | | | | | | | Makefile: do not force unneeded recompilation upon GIT_VERSION changes | Junio C Hamano | 2006-06-22 | 1 | -1/+1 |
| * | | | | | | | | | | Check and document the options to prevent mistakes. | Eric W. Biederman | 2006-06-22 | 2 | -0/+23 |
| * | | | | | | | | | | Pass -DDEFAULT_GIT_TEMPLATE_DIR only where actually used. | Yakov Lerner | 2006-06-22 | 1 | -1/+2 |
* | | | | | | | | | | | Merge branch 'ew/rebase' into next | Junio C Hamano | 2006-06-22 | 1 | -13/+10 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |