Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'maint' | Shawn O. Pearce | 2007-03-05 | 1 | -6/+19 |
|\ | |||||
| * | fast-import: Fail if a non-existant commit is used for merge | Shawn O. Pearce | 2007-03-05 | 1 | -1/+8 |
| * | fast-import: Avoid infinite loop after reset | Shawn O. Pearce | 2007-03-05 | 1 | -5/+11 |
* | | contrib/emacs: Use non-interactive function to byte-compile files | Xavier Maillard | 2007-03-05 | 1 | -2/+2 |
* | | t/t5515-fetch-merge-logic.sh: Added tests for the merge login in git-fetch | Santi BĂ©jar | 2007-03-05 | 63 | -0/+731 |
* | | Post 1.5.0.3 cleanup | Junio C Hamano | 2007-03-04 | 2 | -4/+14 |
* | | Merge branch 'js/fetch-progress' (early part) | Junio C Hamano | 2007-03-04 | 6 | -14/+47 |
|\ \ | |||||
| * | | Fixup no-progress for fetch & clone | Johannes Schindelin | 2007-02-24 | 4 | -18/+9 |
| * | | fetch & clone: do not output progress when not on a tty | Johannes Schindelin | 2007-02-19 | 6 | -13/+55 |
* | | | Merge branch 'js/symlink' | Junio C Hamano | 2007-03-04 | 15 | -13/+175 |
|\ \ \ | |||||
| * | | | Tell multi-parent diff about core.symlinks. | Johannes Sixt | 2007-03-03 | 1 | -0/+10 |
| * | | | Handle core.symlinks=false case in merge-recursive. | Johannes Sixt | 2007-03-03 | 2 | -1/+64 |
| * | | | Add core.symlinks to mark filesystems that do not support symbolic links. | Johannes Sixt | 2007-03-02 | 12 | -12/+101 |
* | | | | Merge branch 'maint' | Junio C Hamano | 2007-03-04 | 5 | -48/+167 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | GIT 1.5.0.3v1.5.0.3 | Junio C Hamano | 2007-03-04 | 2 | -12/+15 |
| * | | | glossary: Add definitions for dangling and unreachable objects | Yasushi SHOJI | 2007-03-04 | 1 | -0/+9 |
| * | | | user-manual: more detailed merge discussion | J. Bruce Fields | 2007-03-04 | 1 | -25/+77 |
| * | | | user-manual: how to replace commits older than most recent | J. Bruce Fields | 2007-03-04 | 1 | -0/+46 |
| * | | | user-manual: insert earlier of mention content-addressable architecture | J. Bruce Fields | 2007-03-04 | 1 | -9/+15 |
| * | | | user-manual: ensure generated manual references stylesheet | J. Bruce Fields | 2007-03-04 | 1 | -1/+4 |
| * | | | user-manual: reset to ORIG_HEAD not HEAD to undo merge | J. Bruce Fields | 2007-03-04 | 1 | -1/+1 |
| * | | | Documentation: mention module option to git-cvsimport | J. Bruce Fields | 2007-03-04 | 1 | -1/+1 |
* | | | | git-svn: fix show-ignore when not connected to the repository root | Eric Wong | 2007-03-04 | 1 | -2/+2 |
* | | | | diff-ni: allow running from a subdirectory. | Junio C Hamano | 2007-03-03 | 1 | -1/+13 |
* | | | | Merge branch 'js/diff-ni' (early part) | Junio C Hamano | 2007-03-03 | 4 | -2/+64 |
|\ \ \ \ | |||||
| * | | | | diff: make more cases implicit --no-index | Johannes Schindelin | 2007-02-28 | 4 | -2/+64 |
* | | | | | Merge branch 'maint' | Junio C Hamano | 2007-03-03 | 9 | -12/+37 |
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | | | |||||
| * | | | Unset NO_C99_FORMAT on Cygwin. | Ramsay Jones | 2007-03-03 | 1 | -1/+0 |
| * | | | Fix a "pointer type missmatch" warning. | Ramsay Jones | 2007-03-03 | 2 | -2/+15 |
| * | | | Fix some "comparison is always true/false" warnings. | Ramsay Jones | 2007-03-03 | 1 | -4/+6 |
| * | | | Fix an "implicit function definition" warning. | Ramsay Jones | 2007-03-03 | 1 | -0/+6 |
| * | | | Fix a "label defined but unreferenced" warning. | Ramsay Jones | 2007-03-03 | 1 | -0/+2 |
| * | | | Document the config variable format.suffix | Johannes Schindelin | 2007-03-03 | 1 | -0/+5 |
| * | | | git-merge: fail correctly when we cannot fast forward. | Junio C Hamano | 2007-03-03 | 1 | -1/+1 |
| * | | | builtin-archive: use RUN_SETUP | Johannes Schindelin | 2007-03-03 | 2 | -3/+1 |
| * | | | Fix git-gc usage note | Matthias Kestenholz | 2007-03-03 | 1 | -1/+1 |
* | | | | Merge branch 'maint' | Junio C Hamano | 2007-03-02 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fix quoting in update hook template | Gerrit Pape | 2007-03-02 | 1 | -1/+1 |
* | | | | git-branch: document new --no-abbrev option | Julian Phillips | 2007-03-02 | 1 | -1/+5 |
* | | | | git-branch: improve abbreviation of sha1s in verbose mode | Julian Phillips | 2007-03-02 | 1 | -2/+10 |
* | | | | print_wrapped_text: fix output for negative indent | Johannes Schindelin | 2007-03-02 | 1 | -1/+1 |
* | | | | Sample update hook: typofix and modernization to use "git log" | Andy Parkins | 2007-03-02 | 1 | -5/+4 |
* | | | | Merge branch 'js/commit-format' | Junio C Hamano | 2007-03-02 | 8 | -16/+268 |
|\ \ \ \ | |||||
| * | | | | show_date(): rename the "relative" parameter to "mode" | Johannes Schindelin | 2007-02-27 | 2 | -9/+14 |
| * | | | | Actually make print_wrapped_text() useful | Johannes Schindelin | 2007-02-27 | 2 | -6/+13 |
| * | | | | pretty-formats: add 'format:<string>' | Johannes Schindelin | 2007-02-22 | 4 | -1/+241 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'maint' | Junio C Hamano | 2007-03-02 | 6 | -20/+20 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Another memory overrun in http-push.c | Eygene Ryabinkin | 2007-03-02 | 1 | -3/+7 |
| * | | | fetch.o depends on the headers, too. | Johannes Schindelin | 2007-03-01 | 1 | -1/+1 |
| * | | | Documentation: Correct minor typo in git-add documentation. | Christian Schlotter | 2007-03-01 | 1 | -1/+1 |